Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-83

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 554-555)

   - Update from CVS
   - Remove CVS keywords from newsticker files

12 files changed, 66 insertions, 32 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 88c130a0ecb..39cd7f0835c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,22 @@
+2005-09-19  Miles Bader  <miles@gnu.org>
+
+        * net/newsticker.el: Get rid of CVS keyword.
+
+2005-09-19  Johan Bockg,Ae(Brd  <bojohan+sf@dd.chalmers.se>
+
+        * dired-aux.el (dired-handle-overwrite): Don't use `format' here.
+        The prompt is formatted later.
+
+2005-09-19  David Ponce  <david@dponce.com>
+
+        * tree-widget.el (tree-widget-value-create): Save the converted
+        tree :node widget.
+
+2005-09-19  Juanma Barranquero  <lekktu@gmail.com>
+
+        * progmodes/sh-script.el (sh-blink): Fix spurious reference to
+        variable `message'.
+
 2005-09-18  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp.el (tramp-login-prompt-regexp): Expand regexp in order
@@ -19,12 +38,12 @@
 2005-09-18  D Goel  <deego@gnufans.org>
 
         * apropos.el (apropos-command): Fix `message' call: first arg
-        should be a format spec. In this and all other cases that appear
+        should be a format spec.  In this and all other cases that appear
         below and elsewhere in the source code, I made a change only when
         two conditions were satisfied: [1] I can think of a possibility
-        that the arguments would cause an error, for example, the code is
-        question relies on extarnal variables such as filenames. [2] I was
-        sure that the arg to `message' could not have been nil in the
+        that the arguments would cause an error, for example, the code in
+        question relies on external variables such as filenames.  [2] I
+        was sure that the arg to `message' could not have been nil in the
         code.
 
         * textmodes/tildify.el (tildify-region): Ditto.
@@ -169,8 +188,8 @@
         * obsolete/fast-lock.el (@top-level): Ditto in the macro
         definition of `with-temp-message'.
 
-        * pcomplete.el (pcomplete--help): Fix `message' format spec. Not
-        having a %s would be weird, though not technically wrong.
+        * pcomplete.el (pcomplete--help): Fix `message' format spec.
+        Not having a %s would be weird, though not technically wrong.
 
 2005-09-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 17e61792d33..6426c6daf58 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1126,8 +1126,8 @@ Special value `always' suppresses confirmation."
              (setq backup (car (find-backup-file-name to)))
              (or (eq 'always dired-backup-overwrite)
                  (dired-query 'overwrite-backup-query
-                              (format "Make backup for existing file `%s'? "
-                                      to))))
+                              "Make backup for existing file `%s'? "
+                              to)))
         (progn
           (rename-file to backup 0)     ; confirm overwrite of old backup
           (dired-relist-entry backup)))))
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index b1c0dd236f5..631bc5cb6a3 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,30 +1,32 @@
-2005-09-18  D Goel  <deego@gnufans.org>
+2005-09-19  Juanma Barranquero  <lekktu@gmail.com>
+
+        * mh-print.el (mh-ps-print-msg-show): Fix misplaced parenthesis in
+        previous change.
 
+2005-09-18  D Goel  <deego@gnufans.org>
 
         * mh-alias.el (mh-alias-ali): Fix `message' call: first arg
         should be a format spec.
-        
-        * mh-print.el (mh-ps-spool-buffer, mh-ps-spool-a-msg)   
-        (mh-ps-print-msg, mh-ps-print-msg-show): Ditto. 
+
+        * mh-print.el (mh-ps-spool-buffer, mh-ps-spool-a-msg)
+        (mh-ps-print-msg, mh-ps-print-msg-show): Ditto.
 
         * mh-mime.el (mh-toggle-mh-decode-mime-flag): Ditto.
-        
-        * mh-index.el (mh-index-sequenced-messages): Ditto.
 
+        * mh-index.el (mh-index-sequenced-messages): Ditto.
 
         * mh-e.el (mh-refile-or-write-again, mh-page-msg): Ditto.
 
         * mh-junk.el (mh-junk-blacklist, mh-junk-whitelist)
         (mh-spamassassin-blacklist, mh-spamassassin-whitelist): Ditto.
 
-
-        
 2005-08-15  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * mh-customize.el: Do not use face-alias compatibility for
         faces that did not appear in the previous Emacs release.
 
 2005-08-10  Lars Hansen  <larsh@soem.dk>
+
         * mh-e.el: Add handler to desktop-buffer-mode-handlers.
         (mh-restore-desktop-buffer): Remove autoload cookie.
         (mh-folder-mode): Add autoload cookie.
diff --git a/lisp/mh-e/mh-print.el b/lisp/mh-e/mh-print.el
index 6b2e8a3474e..41d6a1a0020 100644
--- a/lisp/mh-e/mh-print.el
+++ b/lisp/mh-e/mh-print.el
@@ -153,7 +153,7 @@ interactive use."
   "Print current show buffer to FILE."
   (interactive (list (mh-ps-print-preprint current-prefix-arg)))
   (message "mh-ps-print-msg-show file %s keys %s mh-show-buffer %s"
-                   file (this-command-keys mh-show-buffer))
+                   file (this-command-keys) mh-show-buffer)
   (let ((msg (mh-get-msg-num t))
         (folder mh-current-folder)
         (show-buffer mh-show-buffer)
diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el
index e84234f70e7..acbac4bb3f2 100644
--- a/lisp/net/newsticker.el
+++ b/lisp/net/newsticker.el
@@ -10,7 +10,6 @@
 ;; Created:     17. June 2003
 ;; Keywords:    News, RSS
 ;; Time-stamp:  "26. August 2005, 16:33:46 (ulf)"
-;; CVS-Version: $Id: newsticker.el,v 1.4 2005/09/18 12:36:08 deego Exp $
 
 (defconst newsticker-version "1.8" "Version number of newsticker.el.")
 
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 20af60e8968..3df7dffd21e 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -2574,7 +2574,7 @@ If INFO is supplied it is used, else it is calculated from current line."
         (goto-char blinkpos)
         (if msg (message "%s" msg) (message nil))
         (sit-for blink-matching-delay))
-    (if message (message "%s" msg) (message nil))))
+    (if msg (message "%s" msg) (message nil))))
 
 (defun sh-show-indent (arg)
   "Show the how the currently line would be indented.
diff --git a/lisp/tree-widget.el b/lisp/tree-widget.el
index 049999a7b88..28207436688 100644
--- a/lisp/tree-widget.el
+++ b/lisp/tree-widget.el
@@ -647,14 +647,15 @@ This hook should be local in the buffer setup to display widgets.")
           (when (and (not args) xpandr)
             (setq args (mapcar 'widget-convert (funcall xpandr tree)))
             (widget-put tree :args args))
+          ;; Defer the node widget creation after icon creation.
+          (widget-put tree :node (widget-convert node))
           ;; Create the icon widget for the expanded tree.
           (push (widget-create-child-and-convert
-                 tree (widget-get tree (if args :open-icon :empty-icon))
-                 ;; At this point the node widget isn't yet created.
-                 :node (setq node (widget-convert node)))
+                 tree (widget-get tree (if args :open-icon :empty-icon)))
                 buttons)
           ;; Create the tree node widget.
-          (push (widget-create-child tree node) children)
+          (push (widget-create-child tree (widget-get tree :node))
+                children)
           ;; Update the icon :node with the created node widget.
           (widget-put (car buttons) :node (car children))
           ;; Create the tree children.
@@ -696,14 +697,15 @@ This hook should be local in the buffer setup to display widgets.")
               ;; Update the icon :node with the created node widget.
               (widget-put (car buttons) :node (car children)))))
 ;;;; Collapsed node.
+      ;; Defer the node widget creation after icon creation.
+      (widget-put tree :node (widget-convert node))
       ;; Create the icon widget for the collapsed tree.
       (push (widget-create-child-and-convert
-             tree (widget-get tree :close-icon)
-             ;; At this point the node widget isn't yet created.
-             :node (setq node (widget-convert node)))
+             tree (widget-get tree :close-icon))
             buttons)
       ;; Create the tree node widget.
-      (push (widget-create-child tree node) children)
+      (push (widget-create-child tree (widget-get tree :node))
+            children)
       ;; Update the icon :node with the created node widget.
       (widget-put (car buttons) :node (car children)))
     ;; Save widget children and buttons.  The tree-widget :node child
diff --git a/man/ChangeLog b/man/ChangeLog
index 2a258b3697e..fd836c477b1 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-19  Miles Bader  <miles@gnu.org>
+
+        * newsticker.texi: Get rid of CVS keywords.
+
 2005-09-15  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus.texi (Finding the Parent): Fix description of how Gnus
@@ -8,6 +12,11 @@
         * gnus.texi (Advanced Scoring Examples): New exmples to teach how
         to drop off non-answered articles.
 
+2005-09-19  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (newsticker.dvi): Fix erroneous use of curly
+        brackets on macro `srcdir'.
+
 2005-09-17  Eli Zaretskii  <eliz@gnu.org>
 
         * makefile.w32-in (INFO_TARGETS, DVI_TARGETS): Add newsticker targets.
diff --git a/man/makefile.w32-in b/man/makefile.w32-in
index 45881cee10c..df5d4c4521e 100644
--- a/man/makefile.w32-in
+++ b/man/makefile.w32-in
@@ -329,7 +329,7 @@ url.dvi: url.texi
 $(infodir)/newsticker: newsticker.texi
         $(MAKEINFO) newsticker.texi
 newsticker.dvi: newsticker.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi
+        $(ENVADD) $(TEXI2DVI) $(srcdir)/newsticker.texi
 
 mostlyclean:
         - $(DEL) *.log *.cp *.fn *.ky *.pg *.vr core *.tp *.core gnustmp.*
diff --git a/man/newsticker.texi b/man/newsticker.texi
index 2bcba7a445d..9a2f54ab8b4 100644
--- a/man/newsticker.texi
+++ b/man/newsticker.texi
@@ -1,10 +1,8 @@
 \input texinfo   @c -*-texinfo-*-
-@comment $Id: newsticker.texi,v 1.5 2005/09/17 11:25:06 eliz Exp $
 @comment %**start of header
 @setfilename ../info/newsticker
 @set VERSION 1.8
-@set UPDATED ``$Id: newsticker.texi,v 1.5 2005/09/17 11:25:06 eliz Exp $''
-@settitle Newsticker @value{VERSION}
+@set UPDATED ``$Id: newsticker.texi,v 1.5.2.1 2005/09/19 10:20:01 miles Exp $''
 @syncodeindex vr cp
 @syncodeindex fn cp
 @syncodeindex pg cp
diff --git a/src/ChangeLog b/src/ChangeLog
index 31943170b94..c827ba7c53a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-19  Kim F. Storm  <storm@cua.dk>
+
+        * editfns.c (Fformat): Don't scan past end of format string that
+        ends in %.  Reported by: Johan Bockg,Ae(Brd.
+
 2005-09-18  Andreas Schwab  <schwab@suse.de>
 
         * window.h (struct window): Remove height_fixed_p, no longer set.
diff --git a/src/editfns.c b/src/editfns.c
index dfb6f865dfb..3f33285bcfc 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3556,7 +3556,7 @@ usage: (format STRING &rest OBJECTS)  */)
            digits to print after the '.' for floats, or the max.
            number of chars to print from a string.  */
 
-        while (index ("-0# ", *format))
+        while (*format && index ("-0# ", *format))
           ++format;
 
         if (*format >= '0' && *format <= '9')