aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorJuri Linkov <[email protected]>2005-01-12 00:52:33 +0000
committerJuri Linkov <[email protected]>2005-01-12 00:52:33 +0000
commitaac42a1b2cce228247ab21646cab881ecdf62221 (patch)
tree23e046ed78a49bfa2873eeb288b629620317c569 /lisp
parent0137bae6053ee443661d6b11a0cf7e383593b5fb (diff)
(desktop-save): Add `mode: emacs-lisp' to the local
variables line in desktop files.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/desktop.el2
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bfd88a6e9f..62138a3166 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -17,6 +17,13 @@
to get the right value of window-width in list-colors-print
after the buffer is displayed.
+ * simple.el (pop-mark): Move deactivate-mark out of conditional
+ part to deactivate the active mark regardless of the state of the
+ mark ring.
+
+ * desktop.el (desktop-save): Add `mode: emacs-lisp' to the local
+ variables line in desktop files.
+
2005-01-12 Juri Linkov <[email protected]>
* isearch.el (search-highlight, isearch, isearch-lazy-highlight):
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 77c7a1f076..aaa2487457 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -653,7 +653,7 @@ See also `desktop-base-file-name'."
(erase-buffer)
(insert
- ";; -*- coding: emacs-mule; -*-\n"
+ ";; -*- mode: emacs-lisp; coding: emacs-mule; -*-\n"
desktop-header
";; Created " (current-time-string) "\n"
";; Desktop file format version " desktop-file-version "\n"