projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in last checkin.
[gnus]
/
lisp
/
gnus-spec.el
diff --git
a/lisp/gnus-spec.el
b/lisp/gnus-spec.el
index
40a63f8
..
31e440e
100644
(file)
--- a/
lisp/gnus-spec.el
+++ b/
lisp/gnus-spec.el
@@
-1,7
+1,7
@@
;;; gnus-spec.el --- format spec functions for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
;;; gnus-spec.el --- format spec functions for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; 2005, 2006, 2007, 2008
, 2009, 2010
Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
@@
-25,7
+25,7
@@
;;; Code:
;;; Code:
-;; For Emacs <
22.2
.
+;; For Emacs <
22.2 and XEmacs
.
(eval-and-compile
(unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
(eval-when-compile (require 'cl))
(eval-and-compile
(unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
(eval-when-compile (require 'cl))
@@
-41,7
+41,7
@@
(defcustom gnus-make-format-preserve-properties (featurep 'xemacs)
"*If non-nil, use a replacement `format' function which preserves
(defcustom gnus-make-format-preserve-properties (featurep 'xemacs)
"*If non-nil, use a replacement `format' function which preserves
-text properties. This is only needed on XEmacs, as
FSF
Emacs does this anyway."
+text properties. This is only needed on XEmacs, as Emacs does this anyway."
:version "22.1"
:group 'gnus-format
:type 'boolean)
:version "22.1"
:group 'gnus-format
:type 'boolean)
@@
-680,7
+680,7
@@
are supported for %s."
((string= fstring "%d")
(setq dontinsert t)
(if insert
((string= fstring "%d")
(setq dontinsert t)
(if insert
-
(list `(princ
,(car flist)))
+
`(insert (int-to-string
,(car flist)))
(list `(int-to-string ,(car flist)))))
;; Just lots of chars and strings.
((string-match "\\`\\(%[cs]\\)+\\'" fstring)
(list `(int-to-string ,(car flist)))))
;; Just lots of chars and strings.
((string-match "\\`\\(%[cs]\\)+\\'" fstring)
@@
-709,15
+709,7
@@
are supported for %s."
(when result
(if dontinsert
result
(when result
(if dontinsert
result
- `(progn
- (insert ,@result)
- (if (bolp)
- ;; remove trailing whitespaces from the line
- (progn
- (end-of-line 0)
- (skip-chars-backward " ")
- (delete-region (point) (point-at-eol))
- (forward-line 1))))))
+ (cons 'insert result)))
(cond ((stringp result)
result)
((consp result)
(cond ((stringp result)
result)
((consp result)
@@
-775,5
+767,4
@@
If PROPS, insert the result."
;; coding: iso-8859-1
;; End:
;; coding: iso-8859-1
;; End:
-;; arch-tag: a4328fa1-1f84-4b09-97ad-4b5767cfd50f
;;; gnus-spec.el ends here
;;; gnus-spec.el ends here