Merge from upstream.

1 files changed, 90 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1fa330e8e2a..4a90f2f406d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,91 @@
+2010-01-02  Karl Fogel  <kfogel@red-bean.com>
+
+        * bookmark.el: Remove gratuitous gratitude.
+
+2010-01-02  Karl Fogel  <kfogel@red-bean.com>
+
+        * bookmark.el (bookmark-bmenu-any-marks): New function
+        (bookmark-bmenu-save): Clear buffer modification if no marks.
+
+2010-01-02  Karl Fogel  <kfogel@red-bean.com>
+
+        * bookmark.el (bookmark-bmenu-marks-width): Define to 1, not 2.
+        (bookmark-bmenu-list, bookmark-bmenu-bookmark): Calculate property
+        positions by using `bookmark-bmenu-marks-width', instead of hardcoding.
+        This fixes the `bookmark-bmenu-execute-deletions' bug reported here:
+
+        http://lists.gnu.org/archive/html/emacs-devel/2009-12/msg00819.html
+        From: Sun Yijiang <sunyijiang {_AT_} gmail.com>
+        To: emacs-devel {_AT_} gnu.org
+        Subject: bookmark.el bug report
+        Date: Mon, 28 Dec 2009 14:19:16 +0800
+        Message-ID: 5065e2900912272219y3734fc9fsdaee41167ef99ad7@mail.gmail.com
+
+2010-01-02  Karl Fogel  <kfogel@red-bean.com>
+
+        * bookmark.el: Improvements suggested by Drew Adams:
+        (bookmark-bmenu-ensure-position): New name for
+        `bookmark-bmenu-check-position'.  Just ensure the position,
+        don't return any meaningful value.
+        (bookmark-bmenu-header-height, bookmark-bmenu-marks-width):
+        New constants.
+
+2010-01-02  Juanma Barranquero  <lekktu@gmail.com>
+
+        * bookmark.el (bookmarks-already-loaded): Doc fix (don't use `iff').
+        (bookmark-yank-point, bookmark-bmenu-check-position):
+        Fix typos in docstrings.
+        (bookmark-save-flag, bookmark-bmenu-toggle-filenames)
+        (bookmark-name-from-full-record, bookmark-get-position)
+        (bookmark-set-position, bookmark-set, bookmark-handle-bookmark)
+        (bookmark-delete, bookmark-save, bookmark-save, bookmark-bmenu-mode):
+        Remove useless quoting of parenthesis, etc. in docstrings.
+
+        * ediff-mult.el (ediff-prepare-meta-buffer): Fix typo in help message.
+        (ediff-append-custom-diff): Fix typo in error message.
+        (ediff-meta-mark-equal-files): Fix typos in messages.
+
+        * mpc.el (mpc-playlist-delete): Fix typo in error messages.
+
+        * cedet/semantic/db-typecache.el (semanticdb-typecache-find-default):
+        Fix typo in docstring.
+
+        * net/imap-hash.el (imap-hash-make): Doc fix.
+        (imap-hash-test): Fix typo in error message; reflow docstring.
+        (imap-hash-p, imap-hash-get, imap-hash-put, imap-hash-make-message)
+        (imap-hash-count, imap-hash-server, imap-hash-port, imap-hash-ssl)
+        (imap-hash-mailbox, imap-hash-user, imap-hash-password):
+        Fix typos in docstrings.
+        (imap-hash-open-connection): Fix typo in error message.
+
+        * play/gomoku.el (gomoku): Fix typos in docstring.
+
+        * progmodes/gdb-ui.el (gdb-location-alist): Reflow docstring.
+        (gdb-jsonify-buffer): Fix typos in docstring.
+        (gdb-goto-breakpoint): Fix typo in error message.
+        ("Display Other Windows"): Fix typo in help message.
+        (gdb-speedbar-expand-node): Fix typo in question.
+
+        * progmodes/idlw-help.el (idlwave-help-browse-url-available)
+        (idlwave-html-system-help-location, idlwave-html-help-location)
+        (idlwave-help-browser-function, idlwave-help-browser-generic-program)
+        (idlwave-help-browser-generic-args, idlwave-help-directory)
+        (idlwave-html-help-is-available, idlwave-help-mode-line-indicator)
+        (idlwave-help-mode-map, idlwave-help-mode, idlwave-do-context-help)
+        (idlwave-online-help, idlwave-help-html-link)
+        (idlwave-help-show-help-frame, idlwave-help-assistant-command):
+        Fix typos in docstrings.
+        (idlwave-help-with-source, idlwave-help-find-routine-definition):
+        Reflow docstrings.
+        (idlwave-help-assistant-start): Fix typo in error message.
+
+        * progmodes/octave-mod.el (octave-mode, octave-electric-semi)
+        (octave-electric-space): Fix typos in docstrings.
+
+2010-01-01  Chong Yidong  <cyd@stupidchicken.com>
+
+        * files.el (minibuffer-with-setup-hook): Doc fix (Bug#5149).
+
 2010-01-01  Juri Linkov  <juri@jurta.org>
 
         * comint.el (comint-input-ring-size): Make it a defcustom and
@@ -13,7 +101,7 @@
 
         Show working revision correctly for mercurial.
         * vc-hg.el (vc-hg-working-revision): Use hg parent instead of
-        hg log as suggested by Alex Harsanyi <alexharsanyi@gmail.com>,
+        hg log as suggested by Alex Harsanyi <alexharsanyi@gmail.com>.
 
 2009-12-29  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -66,8 +154,7 @@
         been a secret.  (Further to bug#3717.)
         (Man-bgproc-sentinel): When "-k foo" produces no output show error
         "no matches" rather than "Can't find manpage", as the latter reads
-        like -k was interpreted as a page name, which is not so.  (My
-        bug#5431.)
+        like -k was interpreted as a page name, which is not so.  (Bug#5431)
 
 2009-12-26  Michael Albinus  <michael.albinus@gmx.de>