Mercurial > emacs
changeset 90229:626b546fed64
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
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 19 Sep 2005 11:00:10 +0000 |
| parents | fa0da9b57058 (current diff) 2148ae4e135a (diff) |
| children | fa744c8b8632 |
| files | lisp/ChangeLog lisp/dired-aux.el lisp/mh-e/ChangeLog lisp/mh-e/mh-print.el lisp/net/newsticker.el lisp/progmodes/sh-script.el man/ChangeLog man/makefile.w32-in man/newsticker.texi src/ChangeLog src/editfns.c |
| diffstat | 12 files changed, 66 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Sep 19 10:20:33 2005 +0000 +++ b/lisp/ChangeLog Mon Sep 19 11:00:10 2005 +0000 @@ -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>
--- a/lisp/dired-aux.el Mon Sep 19 10:20:33 2005 +0000 +++ b/lisp/dired-aux.el Mon Sep 19 11:00:10 2005 +0000 @@ -1126,8 +1126,8 @@ (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)))))
--- a/lisp/mh-e/ChangeLog Mon Sep 19 10:20:33 2005 +0000 +++ b/lisp/mh-e/ChangeLog Mon Sep 19 11:00:10 2005 +0000 @@ -1,30 +1,32 @@ +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-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.
--- a/lisp/mh-e/mh-print.el Mon Sep 19 10:20:33 2005 +0000 +++ b/lisp/mh-e/mh-print.el Mon Sep 19 11:00:10 2005 +0000 @@ -153,7 +153,7 @@ "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)
--- a/lisp/net/newsticker.el Mon Sep 19 10:20:33 2005 +0000 +++ b/lisp/net/newsticker.el Mon Sep 19 11:00:10 2005 +0000 @@ -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.")
--- a/lisp/progmodes/sh-script.el Mon Sep 19 10:20:33 2005 +0000 +++ b/lisp/progmodes/sh-script.el Mon Sep 19 11:00:10 2005 +0000 @@ -2574,7 +2574,7 @@ (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.
--- a/lisp/tree-widget.el Mon Sep 19 10:20:33 2005 +0000 +++ b/lisp/tree-widget.el Mon Sep 19 11:00:10 2005 +0000 @@ -647,14 +647,15 @@ (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 @@ ;; 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
--- a/man/ChangeLog Mon Sep 19 10:20:33 2005 +0000 +++ b/man/ChangeLog Mon Sep 19 11:00:10 2005 +0000 @@ -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.
--- a/man/makefile.w32-in Mon Sep 19 10:20:33 2005 +0000 +++ b/man/makefile.w32-in Mon Sep 19 11:00:10 2005 +0000 @@ -329,7 +329,7 @@ $(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.*
--- a/man/newsticker.texi Mon Sep 19 10:20:33 2005 +0000 +++ b/man/newsticker.texi Mon Sep 19 11:00:10 2005 +0000 @@ -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
--- a/src/ChangeLog Mon Sep 19 10:20:33 2005 +0000 +++ b/src/ChangeLog Mon Sep 19 11:00:10 2005 +0000 @@ -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.
--- a/src/editfns.c Mon Sep 19 10:20:33 2005 +0000 +++ b/src/editfns.c Mon Sep 19 11:00:10 2005 +0000 @@ -3556,7 +3556,7 @@ 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')