[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116080: * lisp/saveplace.el (toggle-save-place, sav
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] trunk r116080: * lisp/saveplace.el (toggle-save-place, save-place-to-alist) |
Date: |
Mon, 20 Jan 2014 08:52:47 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116080
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16477
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Mon 2014-01-20 10:52:44 +0200
message:
* lisp/saveplace.el (toggle-save-place, save-place-to-alist)
(save-places-to-alist, save-place-dired-hook): Add (derived-mode-p
'dired-mode) before checking for dired-directory.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/saveplace.el
saveplace.el-20091113204419-o5vbwnq5f7feedwu-622
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-01-20 08:45:56 +0000
+++ b/lisp/ChangeLog 2014-01-20 08:52:44 +0000
@@ -1,5 +1,11 @@
2014-01-20 Juri Linkov <address@hidden>
+ * saveplace.el (toggle-save-place, save-place-to-alist)
+ (save-places-to-alist, save-place-dired-hook): Add (derived-mode-p
+ 'dired-mode) before checking for dired-directory. (Bug#16477)
+
+2014-01-20 Juri Linkov <address@hidden>
+
* indent.el (indent-line-to): Use backward-to-indentation
instead of back-to-indentation. (Bug#16461)
=== modified file 'lisp/saveplace.el'
--- a/lisp/saveplace.el 2014-01-01 07:43:34 +0000
+++ b/lisp/saveplace.el 2014-01-20 08:52:44 +0000
@@ -152,7 +152,8 @@
\(setq-default save-place t\)"
(interactive "P")
- (if (not (or buffer-file-name dired-directory))
+ (if (not (or buffer-file-name (and (derived-mode-p 'dired-mode)
+ dired-directory)))
(message "Buffer `%s' not visiting a file or directory" (buffer-name))
(if (and save-place (or (not parg) (<= parg 0)))
(progn
@@ -172,10 +173,11 @@
;; will be saved again when Emacs is killed.
(or save-place-loaded (load-save-place-alist-from-file))
(let ((item (or buffer-file-name
- (and dired-directory
- (if (consp dired-directory)
- (expand-file-name (car dired-directory))
- (expand-file-name dired-directory))))))
+ (and (derived-mode-p 'dired-mode)
+ dired-directory
+ (expand-file-name (if (consp dired-directory)
+ (car dired-directory)
+ dired-directory))))))
(when (and item
(or (not save-place-ignore-files-regexp)
(not (string-match save-place-ignore-files-regexp
@@ -184,7 +186,8 @@
(position (cond ((eq major-mode 'hexl-mode)
(with-no-warnings
(1+ (hexl-current-address))))
- (dired-directory
+ ((and (derived-mode-p 'dired-mode)
+ dired-directory)
(let ((filename (dired-get-filename nil t)))
(if filename
`((dired-filename . ,filename))
@@ -301,7 +304,8 @@
(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 (or buffer-file-name dired-directory)
+ (and (or buffer-file-name (and (derived-mode-p 'dired-mode)
+ dired-directory))
(save-place-to-alist))
(setq buf-list (cdr buf-list))))))
@@ -321,9 +325,11 @@
(defun save-place-dired-hook ()
"Position the point in a dired buffer."
(or save-place-loaded (load-save-place-alist-from-file))
- (let ((cell (assoc (if (consp dired-directory)
- (expand-file-name (car dired-directory))
- (expand-file-name dired-directory))
+ (let ((cell (assoc (and (derived-mode-p 'dired-mode)
+ dired-directory
+ (expand-file-name (if (consp dired-directory)
+ (car dired-directory)
+ dired-directory)))
save-place-alist)))
(if cell
(progn
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116080: * lisp/saveplace.el (toggle-save-place, save-place-to-alist),
Juri Linkov <=