projects
/
elisp
/
gnus.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix translations.
[elisp/gnus.git-]
/
lisp
/
gnus-xmas.el
diff --git
a/lisp/gnus-xmas.el
b/lisp/gnus-xmas.el
index
7e2b920
..
37037c2
100644
(file)
--- a/
lisp/gnus-xmas.el
+++ b/
lisp/gnus-xmas.el
@@
-1,6
+1,6
@@
;;; gnus-xmas.el --- Gnus functions for XEmacs
;;; gnus-xmas.el --- Gnus functions for XEmacs
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@
-21,8
+21,8
@@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;; Commentary:
@@
-40,7
+40,7
@@
(defvar menu-bar-mode (featurep 'menubar))
(require 'messagexmas)
(require 'wid-edit)
(defvar menu-bar-mode (featurep 'menubar))
(require 'messagexmas)
(require 'wid-edit)
-(require 'run-at-time)
+(require 'timer-funcs)
(defgroup gnus-xmas nil
"XEmacsoid support for Gnus"
(defgroup gnus-xmas nil
"XEmacsoid support for Gnus"
@@
-244,7
+244,7
@@
call it with the value of the `gnus-data' text property."
(select-window selected))))))
;; Select the lowest window on the frame.
(select-window selected))))))
;; Select the lowest window on the frame.
-(defun gnus-xmas-appt-select-lowest-window ()
+(defun gnus-xmas-select-lowest-window ()
(let* ((lowest-window (selected-window))
(bottom-edge (car (cdr (cdr (cdr (window-pixel-edges))))))
(last-window (previous-window))
(let* ((lowest-window (selected-window))
(bottom-edge (car (cdr (cdr (cdr (window-pixel-edges))))))
(last-window (previous-window))
@@
-417,8
+417,8
@@
call it with the value of the `gnus-data' text property."
(defalias 'gnus-read-event-char 'gnus-xmas-read-event-char)
(defalias 'gnus-group-startup-message 'gnus-xmas-group-startup-message)
(defalias 'gnus-tree-minimize 'gnus-xmas-tree-minimize)
(defalias 'gnus-read-event-char 'gnus-xmas-read-event-char)
(defalias 'gnus-group-startup-message 'gnus-xmas-group-startup-message)
(defalias 'gnus-tree-minimize 'gnus-xmas-tree-minimize)
- (defalias 'gnus-appt-select-lowest-window
- 'gnus-xmas-appt-select-lowest-window)
+ (defalias 'gnus-select-lowest-window
+ 'gnus-xmas-select-lowest-window)
(defalias 'gnus-mail-strip-quoted-names 'gnus-xmas-mail-strip-quoted-names)
(defalias 'gnus-character-to-event 'character-to-event)
(defalias 'gnus-mode-line-buffer-identification
(defalias 'gnus-mail-strip-quoted-names 'gnus-xmas-mail-strip-quoted-names)
(defalias 'gnus-character-to-event 'character-to-event)
(defalias 'gnus-mode-line-buffer-identification
@@
-543,7
+543,7
@@
the resulting string may be narrower than END-COLUMN.
" based on " gnus-original-product-name " v"
gnus-original-version-number "\n")
(end-of-line 0)
" based on " gnus-original-product-name " v"
gnus-original-version-number "\n")
(end-of-line 0)
- (put-text-property (point-min) (point) 'face 'gnus-splash-face)
+ (put-text-property (point-min) (point) 'face 'gnus-splash)
(insert-char ?\ (prog1
(max 0 (/ (- (window-width) (point)) 2))
(goto-char (point-min))))
(insert-char ?\ (prog1
(max 0 (/ (- (window-width) (point)) 2))
(goto-char (point-min))))
@@
-593,7
+593,7
@@
the resulting string may be narrower than END-COLUMN.
(rest (- wheight pheight)))
(insert (make-string (max 0 (* 2 (/ rest 3))) ?\n)))
;; Paint it.
(rest (- wheight pheight)))
(insert (make-string (max 0 (* 2 (/ rest 3))) ?\n)))
;; Paint it.
- (put-text-property (point-min) (point-max) 'face 'gnus-splash-face)))
+ (put-text-property (point-min) (point-max) 'face 'gnus-splash)))
(goto-char (point-min))
(setq modeline-buffer-identification
(list (concat gnus-version ": *Group*")))
(goto-char (point-min))
(setq modeline-buffer-identification
(list (concat gnus-version ": *Group*")))
@@
-914,12
+914,13
@@
Warning: Don't insert text immediately after the image."
glyph)
(defun gnus-xmas-remove-image (image &optional category)
glyph)
(defun gnus-xmas-remove-image (image &optional category)
+ "Remove the image matching IMAGE and CATEGORY found first."
(map-extents
(lambda (ext unused)
(when (equal (extent-end-glyph ext) image)
(set-extent-property ext 'invisible nil)
(map-extents
(lambda (ext unused)
(when (equal (extent-end-glyph ext) image)
(set-extent-property ext 'invisible nil)
- (set-extent-property ext 'end-glyph nil))
- nil)
+ (set-extent-property ext 'end-glyph nil)
+ t))
nil nil nil nil nil 'gnus-image category))
(defun gnus-xmas-assq-delete-all (key alist)
nil nil nil nil nil 'gnus-image category))
(defun gnus-xmas-assq-delete-all (key alist)