Merge from emacs--rel--22

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

diff --cc lisp/ChangeLog
index b2f810910a118c67f105518c0765cdc79af503db,aa5b50b22088cb4830cee7af4f125f4d8ce74bc3..686d54fb3cfca155f8c44092aafcea805ed5d702
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,19 -1,8 +1,26 @@@
 -2008-01-29  Alan Mackenzie  <acm@muc.de>
++2008-01-30  Richard Stallman  <rms@gnu.org>
++
++      * progmodes/etags.el (tags-query-replace): Delete unused optional args.
++      Doc fix.
++
++      * files.el (hack-local-variables): Don't query about fake variables.
++
 +2008-01-30  Markus Triska  <markus.triska@gmx.at>
 +
 +      * linum.el: New file.
  
 -      * progmodes/cc-langs.el (c-block-stmt-1-kwds, c-block-stmt-2-kwds)
 -      (c-simple-stmt-kwds): New Objective C keywords: @finally, @try,
 -      @catch, @synchronized, @throw.
 +2008-01-29  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * net/tramp.el (tramp-methods): Use "-H" option for "sudo".  Suggested
 +      by Trent W. Buck <trentbuck@gmail.com>.  Make ("%h") a single
 +      element in "plinkx".
 +      (tramp-handle-shell-command): Reuse "*Async Shell Command*" or
 +      "*Shell Command Output*" buffers.  Check, whether there is already
 +      an asynchronous process running.  Display always the buffer of the
 +      asynchronous process.
 +      (tramp-compute-multi-hops): Adapt error message.
 +
 +2008-01-29  Alan Mackenzie  <acm@muc.de>
  
        * progmodes/cc-langs.el (c-specifier-key): Exclude "template"
        from this regexp; part of same fix as next change to cc-engine.el.
@@@ -168,41 -48,17 +175,41 @@@
        arglist-cont-nonempty into 5 styles (gnu, ellemtel, linux, python,
        awk).
  
 +2008-01-27  Thien-Thi Nguyen  <ttn@gnuvola.org>
 +
 +      * button.el (define-button-type): Clarify type of NAME in docstring.
 +
 +2008-01-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * server.el (server-buffer): New const.
 +      (server-log): New var.
 +      (server-log): Use them.
 +      (server-process-filter): (Try to) run the continuation in the same cwd
 +      as the client's.
 +
  2008-01-26  Alan Mackenzie  <acm@muc.de>
  
 -      * progmodes/cc-defs.el (c-save-buffer-state): Bind
 -      buffer-file-name and buffer-file-truename to nil, to prevent
 +      * progmodes/cc-defs.el (c-save-buffer-state):
 +      Bind buffer-file-name and buffer-file-truename to nil, to prevent
        primitives generating "buffer is read only" messages.
  
 -2008-01-26  Eli Zaretskii  <eliz@gnu.org>
 +2008-01-20  Ulf Jasper  <ulf.jasper@web.de>
  
 -      * progmodes/etags.el (tags-query-replace): Doc fix.
 +      * icalendar.el (icalendar-version): Increase to "0.17".
 +      (icalendar-import-format): Doc fix.  Allow function type.
 +      (icalendar--read-element): Doc fix.
 +      (icalendar--parse-summary-and-rest): Doc fix.  Handle function
 +      type icalendar-import-format.  Make regexps non-greedy.
 +      (icalendar--format-ical-event): Handle function type
 +      icalendar-import-format.
 +      (icalendar-import-format-sample): New function.
 +
 +2008-01-26  Thien-Thi Nguyen  <ttn@gnuvola.org>
 +
 +      * vc.el (vc-exec-after): For mode-line-process highlighting, if
 +      `compile' is not available, fall back to font-lock-warning-face.
  
- 2008-01-26  Phil Sung  <psung@mit.edu> (tiny change)
+ 2008-01-26  Phil Sung  <psung@mit.edu>  (tiny change)
  
        * wdired.el (wdired-get-filename): Change `(1+ beg)' to `beg' so
        that the filename end is found even when the filename is empty.

diff --cc lisp/files.el
Simple merge

diff --cc lisp/progmodes/etags.el
Simple merge