Merge from trunk.

1 files changed, 132 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d3ff6c4225..08f6ac4d075 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,131 @@
+2012-03-01  Michael Albinus  <michael.albinus@gmx.de>
+
+        * files.el (file-equal-p): Fix docstring.  Avoid unnecessary
+        access of FILE2, if FILE1 does not exist.
+
+        * net/tramp-sh.el (tramp-remote-process-environment): Add "PAGER=\"\"".
+        Reported by Robert Lupton the Good <rhl@astro.princeton.edu>.
+
+        * vc/vc-git.el (vc-git--call): Enable `inhibit-null-byte-detection'.
+        Add "PAGER=" to `process-environment'.
+
+2012-03-01  Michael R. Mauger  <mmaug@yahoo.com>
+
+        * progmodes/sql.el: Bug fix
+        (sql-get-login-ext): Save login values in globals.
+        (sql-get-login): Use new version of `sql-get-login-ext'.
+        (sql-interactive-mode): Set global `sql-connection' to nil.
+        (sql-connect): Set global values for connection.
+        (sql-product-interactive): Save global values as buffer local.
+
+2012-02-29  Leo Liu  <sdl.web@gmail.com>
+
+        * abbrev.el (define-abbrevs): Reset sys to nil.
+
+2012-02-28  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
+
+        * files.el (file-equal-p): Rename from `files-equal-p'.
+        Return nil when one or both files don't exist.
+        (file-subdir-of-p): Now only top directory must exists,
+        return nil if it doesn't.
+        (copy-directory): No need to test with `file-subdir-of-p' after
+        creating dir.
+        * net/tramp.el (tramp-file-name-for-operation): Rename `files-equal-p'
+        to `file-equal-p'.
+
+2012-02-28  Glenn Morris  <rgm@gnu.org>
+
+        * shell.el (shell-mode):
+        * progmodes/vhdl-mode.el (wildcard-to-regexp, file-expand-wildcards):
+        * play/landmark.el (landmark-font-lock-face-O):
+        * play/handwrite.el (handwrite):
+        * play/gomoku.el (gomoku-O):
+        * net/browse-url.el (browse-url-browser-display):
+        * international/mule.el (define-charset):
+        * htmlfontify.el (hfy-etags-cmd, hfy-face-attr-for-class):
+        * filesets.el (filesets-find-file-delay):
+        * eshell/em-xtra.el (eshell-xtra):
+        * eshell/em-unix.el (eshell-grep):
+        * emulation/viper.el (viper-mode):
+        * emacs-lisp/regexp-opt.el (regexp-opt-group):
+        * emacs-lisp/easymenu.el (easy-menu-define):
+        * calendar/timeclock.el (timeclock-use-display-time):
+        * bs.el (bs-mode):
+        * bookmark.el (bookmark-save-flag):
+        Doc fix (standardize possessive apostrophe usage).
+
+2012-02-27  Chong Yidong  <cyd@gnu.org>
+
+        * emulation/viper-cmd.el (viper-intercept-ESC-key):
+        Fix key-binding lookup for ESC key (Bug#9146).
+
+        * font-lock.el (font-lock-specified-p): Rename from
+        font-lock-spec-present.  Callers changed.
+
+2012-02-27  Daniel Hackney  <dan@haxney.org>
+
+        * emacs-lisp/package.el (package-compute-transaction):
+        Handle holding a package version to t in package-load-list.
+
+2012-02-26  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-inodes, tramp-devices): Initialize with 0.
+        (tramp-get-inode, tramp-get-device): Use cached values.
+
+2012-02-26  Alan Mackenzie  <acm@muc.de>
+
+        Check there is a font-lock specification before doing initial
+        fontification.
+
+        * font-core.el (font-lock-mode): Move the conditional from
+        :after-hook to font-lock-initial-fontify.
+        (font-lock-default-function): Move the check for a specification
+        to font-lock-spec-present.
+
+        * font-lock.el (font-lock-initial-fontify): call ...
+        (font-lock-spec-present): New function.
+
+2012-02-26  Jim Blandy  <jimb@red-bean.com>
+
+        * progmodes/gdb-mi.el (gdb-mi-quote): New function.
+        (gdb-send): Apply it to the operand of the '-interpreter-exec
+        console' command, so that we can pass arguments with (say) quotes
+        in them.  Store exact string sent in gdb-debug-log (Bug#10765).
+
+2012-02-26  Chong Yidong  <cyd@gnu.org>
+
+        * help-fns.el (describe-function-1): Clarify description of
+        remapping (Bug#10844).
+
+        * files.el (files-equal-p): Doc fix.
+        (file-subdir-of-p): Doc fix.  Convert loop macro to plain Lisp,
+        and quit the loop once a mismatch is found.
+
+2012-02-25  Juanma Barranquero  <lekktu@gmail.com>
+
+        * bs.el (bs--show-with-configuration): Don't throw an error
+        if the window cannot be split; otherwise, subsequent calls to
+        bs-show fail, restoring a stale window config.  (Bug#10882)
+
+2012-02-25  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * term/ns-win.el (global-map): Bind ns-drag-file to
+        ns-find-file (Bug#5855, Bug#10050).
+
+2012-02-25  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * calendar/parse-time.el (parse-time-string): Allow extractor to
+        return nil.
+
+2012-02-25  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-file-name-for-operation):
+        Add `files-equal-p' and `file-subdir-of-p'.
+
+        * net/tramp-sh.el (tramp-sh-handle-copy-directory):
+        * net/tramp-smb.el (tramp-smb-handle-copy-directory):
+        Add COPY-CONTENTS argument.
+
 2012-02-25  Chong Yidong  <cyd@gnu.org>
 
         Add custom groups for VC backends, for consistency with vc-bzr.
@@ -45,9 +173,9 @@
         the execution of the mode hooks.
 
         * font-lock.el (font-lock-initial-fontify): New function extracted
-        from font-lock-mode-interal.
+        from font-lock-mode-internal.
 
-        * font-core.el (font-lock-mode): call font-lock-initial-fontify in
+        * font-core.el (font-lock-mode): Call font-lock-initial-fontify in
         :after-hook.
 
 2012-02-23  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -413,7 +541,7 @@
         * mail/emacsbug.el (report-emacs-bug-hook): Query the user first
         about SMTP before checking the From header.
 
-        * mail/sendmail.el (sendmail-query-user-about-smtp): Refacored out
+        * mail/sendmail.el (sendmail-query-user-about-smtp): Refactor out
         into own function for reuse by emacsbug.el.
 
 2012-02-10  Leo Liu  <sdl.web@gmail.com>
@@ -427,7 +555,7 @@
         * emacs-lisp/package.el (package-refresh-contents)
         (package-menu-execute):
         * desktop.el (desktop-create-buffer):
-        * font-lock.el (lisp-font-lock-keywords-2): caller changed.
+        * font-lock.el (lisp-font-lock-keywords-2): Caller changed.
 
 2012-02-10  Glenn Morris  <rgm@gnu.org>