Mercurial > emacs
annotate lisp/gnus/gmm-utils.el @ 102113:73021f190218
(rmail-summary-by-topic): Doc fix.
Regexp-quote default argument taken from current subject.
(rmail-new-summary-1): Error if empty summary. (Bug#2333)
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Thu, 19 Feb 2009 03:32:23 +0000 |
parents | a9dc0e7c3f2b |
children | 1d1d5d9bd884 |
rev | line source |
---|---|
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
1 ;;; gmm-utils.el --- Utility functions for Gnus, Message and MML |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
2 |
100908 | 3 ;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
4 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
5 ;; Author: Reiner Steib <reiner.steib@gmx.de> |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
6 ;; Keywords: news |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
7 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
8 ;; This file is part of GNU Emacs. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
9 |
94662
f42ef85caf91
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94552
diff
changeset
|
10 ;; GNU Emacs is free software: you can redistribute it and/or modify |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
11 ;; it under the terms of the GNU General Public License as published by |
94662
f42ef85caf91
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94552
diff
changeset
|
12 ;; the Free Software Foundation, either version 3 of the License, or |
f42ef85caf91
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94552
diff
changeset
|
13 ;; (at your option) any later version. |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
14 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
15 ;; GNU Emacs is distributed in the hope that it will be useful, |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
94662
f42ef85caf91
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94552
diff
changeset
|
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
18 ;; GNU General Public License for more details. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
19 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
20 ;; You should have received a copy of the GNU General Public License |
94662
f42ef85caf91
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94552
diff
changeset
|
21 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
22 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
23 ;;; Commentary: |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
24 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
25 ;; This library provides self-contained utility functions. The functions are |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
26 ;; used in Gnus, Message and MML, but within this library there are no |
76836
9feeb7a817c0
* nnmail.el (nnmail-spool-file): Mark as obsolete.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
75347
diff
changeset
|
27 ;; dependencies on Gnus, Message, or MML. |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
28 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
29 ;;; Code: |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
30 |
70720 | 31 (require 'wid-edit) |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
32 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
33 (defgroup gmm nil |
94552
0088cf1fdefd
(gmm, gmm-verbose, gmm-lazy, gmm-customize-mode,
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
34 "Utility functions for Gnus, Message and MML." |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
35 :prefix "gmm-" |
73224 | 36 :version "22.1" ;; Gnus 5.10.9 |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
37 :group 'lisp) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
38 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
39 ;; Helper functions from `gnus-utils.el': gmm-verbose, gmm-message, gmm-error |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
40 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
41 (defcustom gmm-verbose 7 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
42 "Integer that says how verbose gmm should be. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
43 The higher the number, the more messages will flash to say what |
94552
0088cf1fdefd
(gmm, gmm-verbose, gmm-lazy, gmm-customize-mode,
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
44 it did. At zero, it will be totally mute; at five, it will |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
45 display most important messages; and at ten, it will keep on |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
46 jabbering all the time." |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
47 :type 'integer |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
48 :group 'gmm) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
49 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
50 ;;;###autoload |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78486
diff
changeset
|
51 (defun gmm-regexp-concat (regexp) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78486
diff
changeset
|
52 "Potentially concat a list of regexps into a single one. |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78486
diff
changeset
|
53 The concatenation is done with logical ORs." |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78486
diff
changeset
|
54 (cond ((null regexp) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78486
diff
changeset
|
55 nil) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78486
diff
changeset
|
56 ((stringp regexp) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78486
diff
changeset
|
57 regexp) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78486
diff
changeset
|
58 ((listp regexp) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78486
diff
changeset
|
59 (mapconcat (lambda (elt) (concat "\\(" elt "\\)")) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78486
diff
changeset
|
60 regexp |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78486
diff
changeset
|
61 "\\|")))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78486
diff
changeset
|
62 |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78486
diff
changeset
|
63 ;;;###autoload |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
64 (defun gmm-message (level &rest args) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
65 "If LEVEL is lower than `gmm-verbose' print ARGS using `message'. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
66 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
67 Guideline for numbers: |
94552
0088cf1fdefd
(gmm, gmm-verbose, gmm-lazy, gmm-customize-mode,
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
68 1 - error messages |
0088cf1fdefd
(gmm, gmm-verbose, gmm-lazy, gmm-customize-mode,
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
69 3 - non-serious error messages |
0088cf1fdefd
(gmm, gmm-verbose, gmm-lazy, gmm-customize-mode,
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
70 5 - messages for things that take a long time |
0088cf1fdefd
(gmm, gmm-verbose, gmm-lazy, gmm-customize-mode,
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
71 7 - not very important messages on stuff |
0088cf1fdefd
(gmm, gmm-verbose, gmm-lazy, gmm-customize-mode,
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
72 9 - messages inside loops." |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
73 (if (<= level gmm-verbose) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
74 (apply 'message args) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
75 ;; We have to do this format thingy here even if the result isn't |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
76 ;; shown - the return value has to be the same as the return value |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
77 ;; from `message'. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
78 (apply 'format args))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
79 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
80 ;;;###autoload |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
81 (defun gmm-error (level &rest args) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
82 "Beep an error if LEVEL is equal to or less than `gmm-verbose'. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
83 ARGS are passed to `message'." |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
84 (when (<= (floor level) gmm-verbose) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
85 (apply 'message args) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
86 (ding) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
87 (let (duration) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
88 (when (and (floatp level) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
89 (not (zerop (setq duration (* 10 (- level (floor level))))))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
90 (sit-for duration)))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
91 nil) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
92 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
93 ;;;###autoload |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
94 (defun gmm-widget-p (symbol) |
78486
f0a07da7dd45
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78224
diff
changeset
|
95 "Non-nil if SYMBOL is a widget." |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
96 (get symbol 'widget-type)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
97 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
98 ;; Copy of the `nnmail-lazy' code from `nnmail.el': |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
99 (define-widget 'gmm-lazy 'default |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
100 "Base widget for recursive datastructures. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
101 |
94552
0088cf1fdefd
(gmm, gmm-verbose, gmm-lazy, gmm-customize-mode,
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
102 This is a copy of the `lazy' widget in Emacs 22.1 provided for compatibility." |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
103 :format "%{%t%}: %v" |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
104 :convert-widget 'widget-value-convert-widget |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
105 :value-create (lambda (widget) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
106 (let ((value (widget-get widget :value)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
107 (type (widget-get widget :type))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
108 (widget-put widget :children |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
109 (list (widget-create-child-value |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
110 widget (widget-convert type) value))))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
111 :value-delete 'widget-children-value-delete |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
112 :value-get (lambda (widget) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
113 (widget-value (car (widget-get widget :children)))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
114 :value-inline (lambda (widget) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
115 (widget-apply (car (widget-get widget :children)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
116 :value-inline)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
117 :default-get (lambda (widget) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
118 (widget-default-get |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
119 (widget-convert (widget-get widget :type)))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
120 :match (lambda (widget value) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
121 (widget-apply (widget-convert (widget-get widget :type)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
122 :match value)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
123 :validate (lambda (widget) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
124 (widget-apply (car (widget-get widget :children)) :validate))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
125 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
126 ;; Note: The format of `gmm-tool-bar-item' may change if some future Emacs |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
127 ;; version will provide customizable tool bar buttons using a different |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
128 ;; interface. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
129 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
130 ;; TODO: Extend API so that the "Command" entry can be a function or a plist. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
131 ;; In case of a list it should have the format... |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
132 ;; |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
133 ;; (:none command-without-modifier |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
134 ;; :shift command-with-shift-pressed |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
135 ;; :control command-with-ctrl-pressed |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
136 ;; :control-shift command-with-control-and-shift-pressed |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
137 ;; ;; mouse-2 and mouse-3 can't be used in Emacs yet. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
138 ;; :mouse-2 command-on-mouse-2-press |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
139 ;; :mouse-3 command-on-mouse-3-press) ;; typically a menu of related commands |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
140 ;; |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
141 ;; Combinations of mouse-[23] plus shift and/or controll might be overkill. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
142 ;; |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
143 ;; Then use (plist-get rs-command :none), (plist-get rs-command :shift) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
144 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
145 (define-widget 'gmm-tool-bar-item (if (gmm-widget-p 'lazy) 'lazy 'gmm-lazy) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
146 "Tool bar list item." |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
147 :tag "Tool bar item" |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
148 :type '(choice |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
149 (list :tag "Command and Icon" |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
150 (function :tag "Command") |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
151 (string :tag "Icon file") |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
152 (choice |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
153 (const :tag "Default map" nil) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
154 ;; Note: Usually we need non-nil attributes if map is t. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
155 (const :tag "No menu" t) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
156 (sexp :tag "Other map")) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
157 (plist :inline t :tag "Properties")) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
158 (list :tag "Separator" |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
159 (const :tag "No command" gmm-ignore) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
160 (string :tag "Icon file") |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
161 (const :tag "No map") |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
162 (plist :inline t :tag "Properties")))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
163 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
164 (define-widget 'gmm-tool-bar-zap-list (if (gmm-widget-p 'lazy) 'lazy 'gmm-lazy) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
165 "Tool bar zap list." |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
166 :tag "Tool bar zap list" |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
167 :type '(choice (const :tag "Zap all" t) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
168 (const :tag "Keep all" nil) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
169 (list |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
170 ;; :value |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
171 ;; Work around (bug in customize?), see |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
172 ;; <news:v9is48jrj1.fsf@marauder.physik.uni-ulm.de> |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
173 ;; (new-file open-file dired kill-buffer write-file |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
174 ;; print-buffer customize help) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
175 (set :inline t |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
176 (const new-file) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
177 (const open-file) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
178 (const dired) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
179 (const kill-buffer) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
180 (const save-buffer) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
181 (const write-file) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
182 (const undo) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
183 (const cut) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
184 (const copy) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
185 (const paste) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
186 (const search-forward) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
187 (const print-buffer) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
188 (const customize) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
189 (const help)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
190 (repeat :inline t |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
191 :tag "Other" |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
192 (symbol :tag "Icon item"))))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
193 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
194 ;; (defun gmm-color-cells (&optional display) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
195 ;; "Return the number of color cells supported by DISPLAY. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
196 ;; Compatibility function." |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
197 ;; ;; `display-color-cells' doesn't return more than 256 even if color depth is |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
198 ;; ;; > 8 in Emacs 21. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
199 ;; ;; |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
200 ;; ;; Feel free to add proper XEmacs support. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
201 ;; (let* ((cells (and (fboundp 'display-color-cells) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
202 ;; (display-color-cells display))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
203 ;; (plane (and (fboundp 'x-display-planes) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
204 ;; (ash 1 (x-display-planes)))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
205 ;; (none -1)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
206 ;; (max (if (integerp cells) cells none) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
207 ;; (if (integerp plane) plane none)))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
208 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
209 (defcustom gmm-tool-bar-style |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
210 (if (and (boundp 'tool-bar-mode) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
211 tool-bar-mode |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
212 (and (fboundp 'display-visual-class) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
213 (not (memq (display-visual-class) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
214 (list 'static-gray 'gray-scale |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
215 'static-color 'pseudo-color))))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
216 'gnome |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
217 'retro) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
218 "Prefered tool bar style." |
75149 | 219 :type '(choice (const :tag "GNOME style" gnome) |
220 (const :tag "Retro look" retro)) | |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
221 :group 'gmm) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
222 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
223 (defvar tool-bar-map) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
224 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
225 ;;;###autoload |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
226 (defun gmm-tool-bar-from-list (icon-list zap-list default-map) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
227 "Make a tool bar from ICON-LIST. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
228 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
229 Within each entry of ICON-LIST, the first element is a menu |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
230 command, the second element is an icon file name and the third |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
231 element is a test function. You can use \\[describe-key] |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
232 <menu-entry> to find out the name of a menu command. The fourth |
76836
9feeb7a817c0
* nnmail.el (nnmail-spool-file): Mark as obsolete.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
75347
diff
changeset
|
233 and all following elements are passed as the PROPS argument to the |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
234 function `tool-bar-local-item'. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
235 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
236 If ZAP-LIST is a list, remove those item from the default |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
237 `tool-bar-map'. If it is t, start with a new sparse map. You |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
238 can use \\[describe-key] <icon> to find out the name of an icon |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
239 item. When \\[describe-key] <icon> shows \"<tool-bar> <new-file> |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
240 runs the command find-file\", then use `new-file' in ZAP-LIST. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
241 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
242 DEFAULT-MAP specifies the default key map for ICON-LIST." |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
243 (let (;; For Emacs 21, we must let-bind `tool-bar-map'. In Emacs 22, we |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
244 ;; could use some other local variable. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
245 (tool-bar-map (if (eq zap-list t) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
246 (make-sparse-keymap) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
247 (copy-keymap tool-bar-map)))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
248 (when (listp zap-list) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
249 ;; Zap some items which aren't relevant for this mode and take up space. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
250 (dolist (key zap-list) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
251 (define-key tool-bar-map (vector key) nil))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
252 (mapc (lambda (el) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
253 (let ((command (car el)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
254 (icon (nth 1 el)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
255 (fmap (or (nth 2 el) default-map)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
256 (props (cdr (cdr (cdr el)))) ) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
257 ;; command may stem from different from-maps: |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
258 (cond ((eq command 'gmm-ignore) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
259 ;; The dummy `gmm-ignore', see `gmm-tool-bar-item' |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
260 ;; widget. Suppress tooltip by adding `:enable nil'. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
261 (if (fboundp 'tool-bar-local-item) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
262 (apply 'tool-bar-local-item icon nil nil |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
263 tool-bar-map :enable nil props) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
264 ;; (tool-bar-local-item ICON DEF KEY MAP &rest PROPS) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
265 ;; (tool-bar-add-item ICON DEF KEY &rest PROPS) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
266 (apply 'tool-bar-add-item icon nil nil :enable nil props))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
267 ((equal fmap t) ;; Not a menu command |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
268 (if (fboundp 'tool-bar-local-item) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
269 (apply 'tool-bar-local-item |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
270 icon command |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
271 (intern icon) ;; reuse icon or fmap here? |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
272 tool-bar-map props) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
273 ;; Emacs 21 compatibility: |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
274 (apply 'tool-bar-add-item |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
275 icon command |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
276 (intern icon) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
277 props))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
278 (t ;; A menu command |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
279 (if (fboundp 'tool-bar-local-item-from-menu) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
280 (apply 'tool-bar-local-item-from-menu |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
281 ;; (apply 'tool-bar-local-item icon def key |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
282 ;; tool-bar-map props) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
283 command icon tool-bar-map (symbol-value fmap) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
284 props) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
285 ;; Emacs 21 compatibility: |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
286 (apply 'tool-bar-add-item-from-menu |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
287 command icon (symbol-value fmap) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
288 props)))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
289 t)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
290 (if (symbolp icon-list) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
291 (eval icon-list) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
292 icon-list)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
293 tool-bar-map)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
294 |
70720 | 295 (defmacro defun-gmm (name function arg-list &rest body) |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
296 "Create function NAME. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
297 If FUNCTION exists, then NAME becomes an alias for FUNCTION. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
298 Otherwise, create function NAME with ARG-LIST and BODY." |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
299 (let ((defined-p (fboundp function))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
300 (if defined-p |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
301 `(defalias ',name ',function) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
302 `(defun ,name ,arg-list ,@body)))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
303 |
70720 | 304 (defun-gmm gmm-image-search-load-path |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
305 image-search-load-path (file &optional path) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
306 "Emacs 21 and XEmacs don't have `image-search-load-path'. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
307 This function returns nil on those systems." |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
308 nil) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
309 |
70720 | 310 ;; Cf. `mh-image-load-path-for-library' in `mh-compat.el'. |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
311 |
70720 | 312 (defun-gmm gmm-image-load-path-for-library |
313 image-load-path-for-library (library image &optional path no-error) | |
314 "Return a suitable search path for images used by LIBRARY. | |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
315 |
70720 | 316 It searches for IMAGE in `image-load-path' (excluding |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
317 \"`data-directory'/images\") and `load-path', followed by a path |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
318 suitable for LIBRARY, which includes \"../../etc/images\" and |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
319 \"../etc/images\" relative to the library file itself, and then |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
320 in \"`data-directory'/images\". |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
321 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
322 Then this function returns a list of directories which contains |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
323 first the directory in which IMAGE was found, followed by the |
94552
0088cf1fdefd
(gmm, gmm-verbose, gmm-lazy, gmm-customize-mode,
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
324 value of `load-path'. If PATH is given, it is used instead of |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
325 `load-path'. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
326 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
327 If NO-ERROR is non-nil and a suitable path can't be found, don't |
94552
0088cf1fdefd
(gmm, gmm-verbose, gmm-lazy, gmm-customize-mode,
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
328 signal an error. Instead, return a list of directories as before, |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
329 except that nil appears in place of the image directory. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
330 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
331 Here is an example that uses a common idiom to provide |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
332 compatibility with versions of Emacs that lack the variable |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
333 `image-load-path': |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
334 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
335 ;; Shush compiler. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
336 (defvar image-load-path) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
337 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
338 (let* ((load-path (image-load-path-for-library \"mh-e\" \"mh-logo.xpm\")) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
339 (image-load-path (cons (car load-path) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
340 (when (boundp 'image-load-path) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
341 image-load-path)))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
342 (mh-tool-bar-folder-buttons-init))" |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
343 (unless library (error "No library specified")) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
344 (unless image (error "No image specified")) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
345 (let (image-directory image-directory-load-path) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
346 ;; Check for images in image-load-path or load-path. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
347 (let ((img image) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
348 (dir (or |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
349 ;; Images in image-load-path. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
350 (gmm-image-search-load-path image) ;; "gmm-" prefix! |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
351 ;; Images in load-path. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
352 (locate-library image))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
353 parent) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
354 ;; Since the image might be in a nested directory (for |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
355 ;; example, mail/attach.pbm), adjust `image-directory' |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
356 ;; accordingly. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
357 (when dir |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
358 (setq dir (file-name-directory dir)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
359 (while (setq parent (file-name-directory img)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
360 (setq img (directory-file-name parent) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
361 dir (expand-file-name "../" dir)))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
362 (setq image-directory-load-path dir)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
363 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
364 ;; If `image-directory-load-path' isn't Emacs' image directory, |
94552
0088cf1fdefd
(gmm, gmm-verbose, gmm-lazy, gmm-customize-mode,
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
365 ;; it's probably a user preference, so use it. Then use a |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
366 ;; relative setting if possible; otherwise, use |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
367 ;; `image-directory-load-path'. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
368 (cond |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
369 ;; User-modified image-load-path? |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
370 ((and image-directory-load-path |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
371 (not (equal image-directory-load-path |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
372 (file-name-as-directory |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
373 (expand-file-name "images" data-directory))))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
374 (setq image-directory image-directory-load-path)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
375 ;; Try relative setting. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
376 ((let (library-name d1ei d2ei) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
377 ;; First, find library in the load-path. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
378 (setq library-name (locate-library library)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
379 (if (not library-name) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
380 (error "Cannot find library %s in load-path" library)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
381 ;; And then set image-directory relative to that. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
382 (setq |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
383 ;; Go down 2 levels. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
384 d2ei (file-name-as-directory |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
385 (expand-file-name |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
386 (concat (file-name-directory library-name) "../../etc/images"))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
387 ;; Go down 1 level. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
388 d1ei (file-name-as-directory |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
389 (expand-file-name |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
390 (concat (file-name-directory library-name) "../etc/images")))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
391 (setq image-directory |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
392 ;; Set it to nil if image is not found. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
393 (cond ((file-exists-p (expand-file-name image d2ei)) d2ei) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
394 ((file-exists-p (expand-file-name image d1ei)) d1ei))))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
395 ;; Use Emacs' image directory. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
396 (image-directory-load-path |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
397 (setq image-directory image-directory-load-path)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
398 (no-error |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
399 (message "Could not find image %s for library %s" image library)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
400 (t |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
401 (error "Could not find image %s for library %s" image library))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
402 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
403 ;; Return an augmented `path' or `load-path'. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
404 (nconc (list image-directory) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
405 (delete image-directory (copy-sequence (or path load-path)))))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
406 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
407 (defun gmm-customize-mode (&optional mode) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
408 "Customize customization group for MODE. |
94552
0088cf1fdefd
(gmm, gmm-verbose, gmm-lazy, gmm-customize-mode,
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
409 If mode is nil, use `major-mode' of the current buffer." |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
410 (interactive) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
411 (customize-group |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
412 (or mode |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
413 (intern (let ((mode (symbol-name major-mode))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
414 (string-match "^\\(.+\\)-mode$" mode) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
415 (match-string 1 mode)))))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
416 |
73370 | 417 (defun gmm-write-region (start end filename &optional append visit |
418 lockname mustbenew) | |
419 "Compatibility function for `write-region'. | |
420 | |
421 In XEmacs, the seventh argument of `write-region' specifies the | |
422 coding-system." | |
423 (if (and mustbenew | |
424 (or (featurep 'xemacs) | |
425 (= emacs-major-version 20))) | |
426 (if (file-exists-p filename) | |
427 (signal 'file-already-exists | |
428 (list "File exists" filename)) | |
429 (write-region start end filename append visit lockname)) | |
430 (write-region start end filename append visit lockname mustbenew))) | |
431 | |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
432 (provide 'gmm-utils) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
433 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
434 ;; arch-tag: e0b60920-2ce6-40c1-bfc0-cadbbe26b602 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
435 ;;; gmm-utils.el ends here |