(desktop-save): Add `mode: emacs-lisp' to the local

variables line in desktop files.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bfd88a6e9f70982a7241c76921d86dd9b7073d4c..62138a3166c5e43bfe41d8cb79bccf9eb44e54c5 100644 (file)
--- 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  <juri@jurta.org>
 
        * isearch.el (search-highlight, isearch, isearch-lazy-highlight):

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 77c7a1f076f27aa43fd7d1b1f33f138b6bddf117..aaa248745791d03241ef78e3b2fc2ac02f593f5a 100644 (file)
--- 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"