upstream

1 files changed, 194 insertions, 27 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 78cc1862c2f..dfc21373806 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,161 @@
+2012-01-09  Chong Yidong  <cyd@gnu.org>
+
+        * custom.el (custom-safe-themes): Use SHA-256 for hashing.
+
+2012-01-08  Alan Mackenzie  <acm@muc.de>
+
+        Optimise font locking in long enum definitions.
+
+        * progmodes/cc-fonts.el (c-font-lock-declarations): Add an extra
+        arm to a cond form to handle enums.
+        * progmodes/cc-langs.el (c-enums-contain-decls): New lang variable.
+        * progmodes/cc-mode.el (c-font-lock-fontify-region): Correct a typo.
+
+2012-01-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * files.el (move-file-to-trash): Preserve default file modes on error.
+        (Bug#10401)
+
+2012-01-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * faces.el (set-face-attribute): Clarify the meaning of the nil
+        frame (bug#10294).
+
+        * subr.el (with-selected-frame): Mention that the selected frame
+        is restored (bug#9980).
+
+        * ibuffer.el (ibuffer-mode): List the bindings in the corrent map
+        (bug#9759).
+
+        * mail/smtpmail.el (password-cache-add): Removed unused declaration.
+        (password-read): Don't autoload unused function.
+
+2012-01-07  Juanma Barranquero  <lekktu@gmail.com>
+
+        * progmodes/which-func.el (which-func-mode): Turn into a
+        non-interactive function and mark as obsolete (bug#10428).
+
+2012-01-06  Chong Yidong  <cyd@gnu.org>
+
+        * files.el (hack-dir-local-variables-non-file-buffer): Add doc.
+        (hack-one-local-variable-eval-safep): Allow 0 arg for minor mode
+        functions, along with 1 and -1.
+
+2012-01-06  Eli Zaretskii  <eliz@gnu.org>
+
+        * time.el (display-time-load-average)
+        (display-time-default-load-average): Doc fixes.  See the thread
+        starting at
+        http://lists.gnu.org/archive/html/help-gnu-emacs/2012-01/msg00059.html
+        for the details.
+
+2012-01-06  Glenn Morris  <rgm@gnu.org>
+
+        * mail/unrmail.el (unrmail): Give an explicit error if the input file
+        has no messages.  (Bug#10377)
+
+        * info.el (Info-mode-map): Bind e to end-of-buffer, rather
+        than Info-edit.  (Bug#10385)
+
+        * time.el (display-time-load-average, display-time-next-load-average):
+        Doc fixes.
+
+        * emacs-lisp/bytecomp.el (byte-compile-file): Do not propagate a file
+        local setting of buffer-read-only to the input buffer.  (Bug#10419)
+
+        * calendar/calendar.el (calendar-mode):
+        Locally set scroll-margin to 0.  (Bug#10379)
+
+2012-01-06  Ulrich Mueller  <ulm@gentoo.org>
+
+        * play/doctor.el (doctor-death): Escape "," characters.  (Bug#10370)
+
+2012-01-05  Glenn Morris  <rgm@gnu.org>
+
+        * eshell/em-unix.el (diff-no-select): Autoload it.
+        (eshell/diff): Use diff-no-select.  (Bug#10420)
+
+2012-01-05  Chong Yidong  <cyd@gnu.org>
+
+        * shell.el (shell-dynamic-complete-functions): Revert last change.
+        (shell-command-completion-function): New function.
+        (shell-completion-vars): Use it to implement
+        shell-completion-execonly (Bug#10417).
+
+        * custom.el (enable-theme): Don't set custom-safe-themes.
+
+        * cus-theme.el (custom-theme-merge-theme): Ignore
+        custom-enabled-themes and custom-safe-themes.
+
+2012-01-05  Michael R. Mauger  <mmaug@yahoo.com>
+
+        * progmodes/sql.el (sql-login-hook): Add hook to respond to the
+        first prompt in `sql-interacive-mode'.
+        (sql-mode-oracle-font-lock-keywords): Add CONNECT_BY_* builtin
+        keywords.
+        (sql-mode-mysql-font-lock-keywords):  Add ELSEIF keyword.
+        (sql-product-interactive): Bug fix: Set `sql-buffer' in
+        context of original buffer.  Invoke `sql-login-hook'.
+
+2012-01-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * mail/rmail.el (rmail-font-lock-keywords): Accept non-ASCII
+        letters in cite-prefix.
+
+2012-01-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * mail/smtpmail.el (smtpmail-stream-type): Mention the `ssl' value.
+
+2012-01-03  Chong Yidong  <cyd@gnu.org>
+
+        * shell.el (shell-dynamic-complete-functions): Put
+        pcomplete-completions-at-point, so as to try
+        comint-filename-completion first (Bug#10417).
+
+2012-01-02  Richard Stallman  <rms@gnu.org>
+
+        * battery.el (battery-status-function):
+        Detect when to use battery-yeeloong-sysfs.
+        (battery-echo-area-format): Add string for Yeeloong.
+        (battery-linux-proc-apm, battery-linux-proc-acpi): Doc fixes.
+        (battery-yeeloong-sysfs): New function.
+
+2012-01-02  Chong Yidong  <cyd@gnu.org>
+
+        * dirtrack.el (dirtrack-list): Eliminate unused third element.
+        (dirtrack): Merge code for handling relative filenames in prompt
+        from shell-dir-cookie-watcher.
+        (dirtrack-debug-message): New arg to avoid excess format calls.
+
+        * shell.el (shell-dir-cookie-re): Variable deleted.
+        (shell-dir-cookie-watcher): Function deleted.
+        (shell-mode): Don't use shell-dir-cookie-re, since it is redundant
+        with dirtrack-mode.
+
+2012-01-01  Eli Zaretskii  <eliz@gnu.org>
+
+        * term/w32-win.el (dynamic-library-alist) <gnutls>: Load
+        libgnutls-28.dll, from GnuTLS version 3.x, in preference to
+        libgnutls-26.dll.
+
+2011-12-31  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * emacs-lisp/bytecomp.el (byte-compile-file): Fix indentation.
+
+2011-12-31  Eli Zaretskii  <eliz@gnu.org>
+
+        * mail/rmail.el (rmail-show-message-1): Decode any RFC2047 encoded
+        headers of non-MIME messages, when rmail-enable-mime is non-nil.
+
+2011-12-29  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-find-shell): Set "remote-shell" property
+        also for alternative shells.
+        (tramp-open-connection-setup-interactive-shell): Check, whether
+        the shell is a busybox.
+        (tramp-send-command): Don't suppress multiple prompts for
+        busyboxes, it hurts.
+
 2011-12-28  Chong Yidong  <cyd@gnu.org>
 
         * progmodes/gdb-mi.el (gdb-get-source-file-list)
@@ -21,8 +179,8 @@
         (gdb-var-delete-children, gdb-edit-value, gdb-var-update)
         (gdb-stopped, def-gdb-auto-update-trigger)
         (gdb-place-breakpoints, gdb-select-thread, gdb-select-frame)
-        (gdb-get-changed-registers, gdb-get-main-selected-frame): Callers
-        changed.
+        (gdb-get-changed-registers, gdb-get-main-selected-frame):
+        Callers changed.
         (gud-gdbmi-completions): New function.
         (gdb): Use it for generating the completion table.
 
@@ -32,22 +190,22 @@
         locking.  Use this to protect declarations from losing their
         contexts.
 
-        * progmodes/cc-langs.el (c-before-font-lock-functions): replace
+        * progmodes/cc-langs.el (c-before-font-lock-functions): Replace
         c-set-fl-decl-start with c-change-set-fl-decl-start (Renaming).
-        (c-before-context-fontification-functions): new defvar, a list of
+        (c-before-context-fontification-functions): New defvar, a list of
         functions to be run just before context (etc.) font locking.
 
         * progmodes/cc-mode.el (c-extend-font-lock-region-for-macros):
-        new, functionality extracted from
+        New, functionality extracted from
         c-neutralize-syntax-in-and-mark-CPP.
-        (c-in-after-change-fontification): new variable.
+        (c-in-after-change-fontification): New variable.
         (c-after-change): Set c-in-after-change-fontification.
         (c-set-fl-decl-start): Rejig its interface, so it can be called
         from both after-change and context fontifying.
-        (c-change-set-fl-decl-start, c-context-set-fl-decl-start): new
-        functions.
-        (c-standard-font-lock-fontify-region-function): new variable.
-        (c-font-lock-fontify-region): new function.
+        (c-change-set-fl-decl-start, c-context-set-fl-decl-start):
+        New functions.
+        (c-standard-font-lock-fontify-region-function): New variable.
+        (c-font-lock-fontify-region): New function.
 
 2011-12-24  Juri Linkov  <juri@jurta.org>
 
@@ -63,17 +221,17 @@
 
         Fix unstable fontification inside templates.
 
-        * progmodes/cc-langs.el (c-before-font-lock-functions): newly
-        created from the singular version.  The (c c++ objc) entry now
+        * progmodes/cc-langs.el (c-before-font-lock-functions):
+        Newly created from the singular version.  The (c c++ objc) entry now
         additionally has c-set-fl-decl-start.  The other languages (apart
         from AWK) have that as a single entry.
 
-        * progmodes/cc-fonts.el (c-font-lock-enclosing-decls): The
-        functionality for "local" declarations has been extracted to
+        * progmodes/cc-fonts.el (c-font-lock-enclosing-decls):
+        The functionality for "local" declarations has been extracted to
         c-set-fl-decl-start.
 
-        * progmodes/cc-mode.el: (c-common-init, c-after-change): Changes
-        due to pluralisation of c-before-font-lock-functions.
+        * progmodes/cc-mode.el (c-common-init, c-after-change):
+        Changes due to pluralisation of c-before-font-lock-functions.
         (c-set-fl-decl-start): New function, extracted from
         c-font-lock-enclosing-decls and enhanced.
 
@@ -99,16 +257,25 @@
 
 2011-12-21  Teodor Zlatanov  <tzz@lifelogs.com>
 
-        * progmodes/cfengine.el: Add Version.
-
-        Add CFEngine 3.x syntax highlighting and support with
-        `cfengine3-mode', and rename the old `cfengine-mode' to
-        `cfengine2-mode'.  Make `cfengine-mode' an automatic content-based
-        switcher between `cfengine3-mode' and `cfengine2-mode' by aliasing
-        it to `cfengine-auto-mode'.  Rename variables specific to
-        `cfengine2-mode' from cfengine-* to cfengine2-*.  Change the
-        modeline indicator to "CFE2" and "CFE3" depending on the mode, to
-        save space. Mark `cfengine-mode-abbrevs' as obsolete.
+        * progmodes/cfengine.el: Add Version.  Improve CFEngine 3.x syntax
+        highlighting and support.  Fix up comments for capitalization.
+        (cfengine-mode-debug): New var.
+        (cfengine3-mode): Change the modeline indicator to "CFE3".
+        (cfengine3-font-lock-keywords): Improve defun highlighting.
+        (cfengine2-actions): Rename from `cfengine-actions'.
+        (cfengine2-font-lock-keywords): Rename from
+        `cfengine-font-lock-keywords'.
+        (cfengine2-imenu-expression): Rename from
+        `cfengine-imenu-expression'.
+        (cfengine2-outline-level): Rename from `cfengine-outline-level'.
+        (cfengine2-beginning-of-defun): Rename from
+        `cfengine-beginning-of-defun'.
+        (cfengine2-end-of-defun): Rename from `cfengine-end-of-defun'.
+        (cfengine2-indent-line): Rename from `cfengine-indent-line'.
+        (cfengine2-mode): Rename from `cfengine-mode'.  Change the
+        modeline indicator to "CFE2".
+        (cfengine-mode): Defalias to `cfengine-auto-mode'.
+        (cfengine-mode-abbrevs): Mark obsolete.
 
 2011-12-21  Chong Yidong  <cyd@gnu.org>
 
@@ -9751,7 +9918,7 @@ See ChangeLog.15 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2011  Free Software Foundation, Inc.
+  Copyright (C) 2011-2012  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.