HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert consecutive FSF copyright years to ranges.
[bpt/emacs.git]
/
lisp
/
saveplace.el
diff --git
a/lisp/saveplace.el
b/lisp/saveplace.el
index
3b5a66e
..
b7d43bd
100644
(file)
--- a/
lisp/saveplace.el
+++ b/
lisp/saveplace.el
@@
-1,7
+1,6
@@
;;; saveplace.el --- automatically save place in files
;;; saveplace.el --- automatically save place in files
-;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2001-2011 Free Software Foundation, Inc.
;; Author: Karl Fogel <kfogel@red-bean.com>
;; Maintainer: FSF
;; Author: Karl Fogel <kfogel@red-bean.com>
;; Maintainer: FSF
@@
-10,10
+9,10
@@
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; GNU Emacs is free software
:
you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-21,9
+20,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-39,7
+36,7
@@
;;; Code:
;; this is what I was using during testing:
;;; Code:
;; this is what I was using during testing:
-;; (define-key ctl-x-map "p" 'toggle-save-place)
+;; (define-key ctl-x-map "p" 'toggle-save-place
-globally
)
(defgroup save-place nil
"Automatically save place in files."
(defgroup save-place nil
"Automatically save place in files."
@@
-54,7
+51,7
@@
rather than the beginning of the buffer.
This alist is saved between Emacs sessions.")
(defcustom save-place nil
This alist is saved between Emacs sessions.")
(defcustom save-place nil
- "
*
Non-nil means automatically save place in each file.
+ "Non-nil means automatically save place in each file.
This means when you visit a file, point goes to the last place
where it was when you previously visited the same file.
This variable is automatically buffer-local.
This means when you visit a file, point goes to the last place
where it was when you previously visited the same file.
This variable is automatically buffer-local.
@@
-73,12
+70,12
@@
or else use the Custom facility to set this option."
(make-variable-buffer-local 'save-place)
(defcustom save-place-file (convert-standard-filename "~/.emacs-places")
(make-variable-buffer-local 'save-place)
(defcustom save-place-file (convert-standard-filename "~/.emacs-places")
- "
*
Name of the file that records `save-place-alist' value."
+ "Name of the file that records `save-place-alist' value."
:type 'file
:group 'save-place)
(defcustom save-place-version-control nil
:type 'file
:group 'save-place)
(defcustom save-place-version-control nil
- "
*
Controls whether to make numbered backups of master save-place file.
+ "Controls whether to make numbered backups of master save-place file.
It can have four values: t, nil, `never', and `nospecial'. The first
three have the same meaning that they do for the variable
`version-control', and the final value `nospecial' means just use the
It can have four values: t, nil, `never', and `nospecial'. The first
three have the same meaning that they do for the variable
`version-control', and the final value `nospecial' means just use the
@@
-207,8
+204,7
@@
may have changed\) back to `save-place-alist'."
(defun save-place-alist-to-file ()
(let ((file (expand-file-name save-place-file))
(coding-system-for-write 'utf-8))
(defun save-place-alist-to-file ()
(let ((file (expand-file-name save-place-file))
(coding-system-for-write 'utf-8))
- (save-excursion
- (set-buffer (get-buffer-create " *Saved Places*"))
+ (with-current-buffer (get-buffer-create " *Saved Places*")
(delete-region (point-min) (point-max))
(when save-place-forget-unreadable-files
(save-place-forget-unreadable-files))
(delete-region (point-min) (point-max))
(when save-place-forget-unreadable-files
(save-place-forget-unreadable-files))
@@
-216,7
+212,9
@@
may have changed\) back to `save-place-alist'."
(symbol-name coding-system-for-write)))
(let ((print-length nil)
(print-level nil))
(symbol-name coding-system-for-write)))
(let ((print-length nil)
(print-level nil))
- (print save-place-alist (current-buffer)))
+ (pp (sort save-place-alist
+ (lambda (a b) (string< (car a) (car b))))
+ (current-buffer)))
(let ((version-control
(cond
((null save-place-version-control) nil)
(let ((version-control
(cond
((null save-place-version-control) nil)
@@
-238,10
+236,9
@@
may have changed\) back to `save-place-alist'."
;; make sure that the alist does not get overwritten, and then
;; load it if it exists:
(if (file-readable-p file)
;; make sure that the alist does not get overwritten, and then
;; load it if it exists:
(if (file-readable-p file)
- (save-excursion
- ;; don't want to use find-file because we have been
- ;; adding hooks to it.
- (set-buffer (get-buffer-create " *Saved Places*"))
+ ;; don't want to use find-file because we have been
+ ;; adding hooks to it.
+ (with-current-buffer (get-buffer-create " *Saved Places*")
(delete-region (point-min) (point-max))
(insert-file-contents file)
(goto-char (point-min))
(delete-region (point-min) (point-max))
(insert-file-contents file)
(goto-char (point-min))
@@
-277,8
+274,7
@@
may have changed\) back to `save-place-alist'."
;; put this into a save-excursion in case someone is counting on
;; another function in kill-emacs-hook to act on the last buffer
;; they were in:
;; put this into a save-excursion in case someone is counting on
;; another function in kill-emacs-hook to act on the last buffer
;; they were in:
- (save-excursion
- (set-buffer (car buf-list))
+ (with-current-buffer (car buf-list)
;; save-place checks buffer-file-name too, but we can avoid
;; overhead of function call by checking here too.
(and buffer-file-name (save-place-to-alist))
;; save-place checks buffer-file-name too, but we can avoid
;; overhead of function call by checking here too.
(and buffer-file-name (save-place-to-alist))
@@
-310,5
+306,4
@@
may have changed\) back to `save-place-alist'."
(provide 'saveplace) ; why not...
(provide 'saveplace) ; why not...
-;;; arch-tag: 3c2ef47b-0a22-4558-b116-118c9ef454a0
;;; saveplace.el ends here
;;; saveplace.el ends here