diff options
| author | Juanma Barranquero | 2013-07-24 01:10:58 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2013-07-24 01:10:58 +0200 |
| commit | da77a2e2ebfd09f70d6b91d868ae9195a9981206 (patch) | |
| tree | 256d45702a7fb9ecf9bc88ee982f9782c534a9ed | |
| parent | 60967f56e71c1e578cb2f0585a8d64d54394110f (diff) | |
| download | emacs-da77a2e2ebfd09f70d6b91d868ae9195a9981206.tar.gz emacs-da77a2e2ebfd09f70d6b91d868ae9195a9981206.zip | |
lisp/desktop.el (desktop-clear): Fix previous change.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/desktop.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 71e1777ef72..424b175f6f8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-07-23 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * desktop.el (desktop-clear, desktop-list*): Fix previous change. | ||
| 4 | |||
| 1 | 2013-07-23 Michael Albinus <michael.albinus@gmx.de> | 5 | 2013-07-23 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 6 | ||
| 3 | * net/tramp.el (tramp-handle-file-notify-add-watch): New defun. | 7 | * net/tramp.el (tramp-handle-file-notify-add-watch): New defun. |
diff --git a/lisp/desktop.el b/lisp/desktop.el index 36e4981b821..0cbe38c29e1 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el | |||
| @@ -652,7 +652,7 @@ Furthermore, it clears the variables listed in `desktop-globals-to-clear'." | |||
| 652 | "\\)$"))) | 652 | "\\)$"))) |
| 653 | (dolist (buffer (buffer-list)) | 653 | (dolist (buffer (buffer-list)) |
| 654 | (let ((bufname (buffer-name buffer))) | 654 | (let ((bufname (buffer-name buffer))) |
| 655 | (unless (or (eq (aref bufname 0) ?s) ;; Don't kill internal buffers | 655 | (unless (or (eq (aref bufname 0) ?\s) ;; Don't kill internal buffers |
| 656 | (string-match-p preserve-regexp bufname)) | 656 | (string-match-p preserve-regexp bufname)) |
| 657 | (kill-buffer buffer))))) | 657 | (kill-buffer buffer))))) |
| 658 | (delete-other-windows)) | 658 | (delete-other-windows)) |