From: Juri Linkov <juri@jurta.org>
Date: Wed, 12 Jan 2005 00:52:33 +0000 (+0000)
Subject: (desktop-save): Add `mode: emacs-lisp' to the local
X-Git-Tag: ttn-vms-21-2-B4~2807
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aac42a1b2cce228247ab21646cab881ecdf62221;p=emacs.git

(desktop-save): Add `mode: emacs-lisp' to the local
variables line in desktop files.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bfd88a6e9f7..62138a3166c 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  <juri@jurta.org>
 
 	* isearch.el (search-highlight, isearch, isearch-lazy-highlight):
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 77c7a1f076f..aaa24874579 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"