Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-851

1 files changed, 158 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8a486ed424f..a5d54560e97 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,161 @@
+2007-08-13  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el (gdb-send): Handle CTRL-D more carefully.
+
+2007-08-12  Richard Stallman  <rms@gnu.org>
+
+        * pcvs.el (cvs-reread-cvsrc, cvs-checkout, cvs-mode-checkout)
+        (cvs-execute-single-file): Use new name split-string-and-unquote.
+        (cvs-header-msg): Use new name combine-and-quote-strings.
+
+        * emulation/vi.el (vi-next-line): Ignore return value of line-move.
+
+        * progmodes/gud.el (gud-common-init): Use new name
+        split-string-and-unquote.
+
+        * progmodes/flymake.el (flymake-err-line-patterns): Fix infloop
+        in javac regexp.
+
+        * pcvs-util.el (cvs-qtypedesc-strings): Use new names
+        combine-and-quote-strings and split-string-and-unquote.
+
+        * subr.el (combine-and-quote-strings): Renamed from strings->string.
+        (split-string-and-unquote): Renamed from string->strings.
+
+2007-08-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * log-view.el (log-view-font-lock-keywords): Use `eval' so as to adapt
+        to buffer-local settings.
+
+        * emacs-lisp/backquote.el (backquote-delay-process): New function.
+        (backquote-process): Add internal arg `level'.  Use the two to
+        correctly handle nested backquotes.
+
+2007-08-09  Riccardo Murri  <riccardo.murri@gmail.com>
+
+        * vc-bzr.el (vc-bzr-registered): Use \0 instead of literal NULs.
+        (vc-bzr-state-words): Add "kind changed" state word.
+        (vc-bzr-status): New function.  Return Bzr idea of file status,
+        which is different from VC's.
+        (vc-bzr-state): Use vc-bzr-status.
+        (vc-workfile-unchanged-p): Use vc-bzr-status.
+        (vc-bzr-revert): Use synchronous process; expect exitcode 0.
+        (vc-dired-state): Process "kind changed" state word.
+
+2007-08-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * vc-hooks.el (vc-default-find-file-not-found-hook): Do nothing.
+
+        * vc-rcs.el (vc-rcs-find-file-not-found-hook):
+        Move from vc-default-find-file-not-found-hook.
+
+2007-08-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * man.el: Remove spurious * in docstrings.
+        Merge defvars and toplevel setq-defaults.
+        (Man-highlight-references0): Limit=nil rather than point-max.
+        (Man-mode-map): Move initialization into the declaration.
+        (Man-strip-page-headers, Man-unindent): Use dolist & inhibit-read-only.
+        (Man-view-header-file): Use expand-file-name rather than concat.
+        (Man-notify-when-ready, Man-bgproc-sentinel): Use with-current-buffer.
+
+        * man.el (Man-next-section): Make sure we do not move backward.
+
+2007-08-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * files.el (auto-mode-alist): Use the purecopied text (duh!).
+
+2007-08-08  Glenn Morris  <rgm@gnu.org>
+
+        * Replace `iff' in doc-strings and comments.
+
+2007-08-08  Martin Rudalics  <rudalics@gmx.at>
+
+        * dired.el (dired-pop-to-buffer):
+        * mouse-drag.el (mouse-drag-should-do-col-scrolling):
+        * calendar/calendar.el (generate-calendar-window):
+        * progmodes/compile.el (compilation-set-window-height):
+        * textmodes/two-column.el (2C-two-columns, 2C-merge):
+        Use window-full-width-p instead of comparing frame-width and
+        window-width.
+
+        * progmodes/compile.el (compilation-find-buffer): Remove extra
+        argument in call to compilation-buffer-internal-p.
+
+2007-08-07  Tom Tromey  <tromey@redhat.com>
+
+        * progmodes/tcl.el (tcl-indent-level, tcl-continued-indent-level):
+        Add safe-local-variable property.
+
+2007-08-07  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image-mode.el (image-toggle-display): Use image-refresh.
+
+2007-08-07  Riccardo Murri  <riccardo.murri@gmail.com>
+
+        * vc-bzr.el: Remove comments about vc-bzr.el being a modified
+        unofficial version.
+        (vc-bzr-command): Remove redundant setting of process-connection-type.
+        (vc-bzr-admin-checkout-format-file): Add autoload.
+        (vc-bzr-root-dir): Remove in favor of vc-bzr-root.
+        (vc-bzr-root): Switch to implementation of vc-bzr-root-dir.
+        (vc-bzr-registered): Compare dirstate format tag with known good
+        value, abort parsing if match fails.  Warn user in docstring.
+        (vc-bzr-workfile-version): Case for different Bzr branch formats.
+        See bzrlib/branch.py in Bzr sources.
+        (vc-bzr-diff): First argument FILES may be a string rather than a list.
+        (vc-bzr-shell-command): Remove in favor of
+        vc-bzr-command-discarding-stderr.
+        (vc-bzr-command-discarding-stderr): New function.
+
+2007-08-06  Riccardo Murri  <riccardo.murri@gmail.com>
+
+        * vc-bzr.el (vc-bzr-registered): Gracefully handle missing "bzr"
+        program, and return nil
+        (vc-bzr-state): Gracefully handle missing "bzr" program, and return nil.
+        (vc-bzr-state): Look for path names relative to the repository
+        root after status keyword.
+        (vc-bzr-file-name-relative): New function.
+        (vc-bzr-admin-dirname): Reinstate, as other vc-bzr-admin-... paths
+        depend on it.
+        (vc-bzr-admin-dirname, ...-checkout-format-file)
+        (...-branch-format-file, ...-revhistory): Paths to some Bzr internal
+        files that we now parse directly for speed.
+        (vc-bzr-root-dir): Use `vc-bzr-admin-checkout-format-file' as witness.
+        (vc-bzr-registered): Only parse vc-bzr-admin-dirstate file if it exists.
+        (vc-bzr-state): "bzr status" successful only if exitcode is 0
+        (vc-bzr-root): Use `vc-bzr-shell-command'.  Stderr may contain
+        Bzr warnings, so we must discard it.
+        (vc-bzr-workfile-version): Speedup counting lines from
+        `vc-bzr-admin-revhistory' file, but fallback to spawning "bzr revno"
+        if that file doesn't exist.
+        (vc-bzr-responsible-p): Use `vc-bzr-root' instead of
+        `vc-bzr-root-dir' for speed.  Add `vc-bzr-admin-dirname'
+        (not ".bzr"!) to `vc-directory-exclusion-list'
+        (vc-bzr-shell-command): New function.
+
+2007-08-06  Tom Tromey  <tromey@redhat.com>
+
+        * diff-mode.el (diff-unified->context, diff-reverse-direction)
+        (diff-fixup-modifs): Typo in docstring.
+
+2007-08-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emulation/tpu-edt.el (tpu-current-line): Use posn-at-point and
+        count-screen-lines.
+        (tpu-edt-off): Disable relevant pieces of advice.
+
+        * emulation/tpu-extras.el (tpu-before-save-hook): Rename from
+        tpu-write-file-hook.  Activate it with add-hook on buffer-save-hook.
+        (newline, newline-and-indent, do-auto-fill): Use advice instead of
+        redefining the function.
+        (tpu-set-scroll-margins): Activate the pieces of advice.
+
+2007-08-06  Martin Rudalics  <rudalics@gmx.at>
+
+        * help.el (resize-temp-buffer-window): Use window-full-width-p
+        instead of comparing frame-width and window-width.
+
 2007-08-13  Stephen Leake  <stephen_leake@stephe-leake.org>
 
         * pcvs-parse.el (cvs-parse-table): Handle additional instance of