Mercurial > emacs
annotate lisp/gnus/gmm-utils.el @ 78448:681eb7074f83
* dispextern.h (struct image): New members.
* image.c: Sync to trunk version.
(search_image_cache, uncache_image, image-refresh): New functions.
Check for fg and bg colors.
(lookup_image): Use search_image_cache. Cache fg and bg colors.
(pbm_load): Another check for invalid image data.
(png_load): Ignore default background field.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Tue, 07 Aug 2007 16:32:21 +0000 |
parents | 24202b793a08 |
children | f0a07da7dd45 |
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 |
75347 | 3 ;; Copyright (C) 2006, 2007 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 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
10 ;; GNU Emacs is free software; you can redistribute it and/or modify |
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 |
78224
24202b793a08
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
76836
diff
changeset
|
12 ;; the Free Software Foundation; either version 3, or (at your option) |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
13 ;; any later version. |
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 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
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 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
22 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
23 ;; Boston, MA 02110-1301, USA. |
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 ;;; Commentary: |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
26 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
27 ;; 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
|
28 ;; 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
|
29 ;; dependencies on Gnus, Message, or MML. |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
30 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
31 ;;; Code: |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
32 |
70720 | 33 (require 'wid-edit) |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
34 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
35 (defgroup gmm nil |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
36 "Utility functions for Gnus, Message and MML" |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
37 :prefix "gmm-" |
73224 | 38 :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
|
39 :group 'lisp) |
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 ;; 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
|
42 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
43 (defcustom gmm-verbose 7 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
44 "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
|
45 The higher the number, the more messages will flash to say what |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
46 it done. At zero, it will be totally mute; at five, it will |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
47 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
|
48 jabbering all the time." |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
49 :type 'integer |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
50 :group 'gmm) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
51 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
52 ;;;###autoload |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
53 (defun gmm-message (level &rest args) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
54 "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
|
55 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
56 Guideline for numbers: |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
57 1 - error messages, 3 - non-serious error messages, 5 - messages for things |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
58 that take a long time, 7 - not very important messages on stuff, 9 - messages |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
59 inside loops." |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
60 (if (<= level gmm-verbose) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
61 (apply 'message args) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
62 ;; 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
|
63 ;; 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
|
64 ;; from `message'. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
65 (apply 'format args))) |
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 ;;;###autoload |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
68 (defun gmm-error (level &rest args) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
69 "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
|
70 ARGS are passed to `message'." |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
71 (when (<= (floor level) gmm-verbose) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
72 (apply 'message args) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
73 (ding) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
74 (let (duration) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
75 (when (and (floatp level) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
76 (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
|
77 (sit-for duration)))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
78 nil) |
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-widget-p (symbol) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
82 "Non-nil iff SYMBOL is a widget." |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
83 (get symbol 'widget-type)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
84 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
85 ;; 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
|
86 (define-widget 'gmm-lazy 'default |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
87 "Base widget for recursive datastructures. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
88 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
89 This is copy of the `lazy' widget in Emacs 22.1 provided for compatibility." |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
90 :format "%{%t%}: %v" |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
91 :convert-widget 'widget-value-convert-widget |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
92 :value-create (lambda (widget) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
93 (let ((value (widget-get widget :value)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
94 (type (widget-get widget :type))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
95 (widget-put widget :children |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
96 (list (widget-create-child-value |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
97 widget (widget-convert type) value))))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
98 :value-delete 'widget-children-value-delete |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
99 :value-get (lambda (widget) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
100 (widget-value (car (widget-get widget :children)))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
101 :value-inline (lambda (widget) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
102 (widget-apply (car (widget-get widget :children)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
103 :value-inline)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
104 :default-get (lambda (widget) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
105 (widget-default-get |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
106 (widget-convert (widget-get widget :type)))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
107 :match (lambda (widget value) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
108 (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
|
109 :match value)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
110 :validate (lambda (widget) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
111 (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
|
112 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
113 ;; 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
|
114 ;; 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
|
115 ;; interface. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
116 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
117 ;; 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
|
118 ;; 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
|
119 ;; |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
120 ;; (:none command-without-modifier |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
121 ;; :shift command-with-shift-pressed |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
122 ;; :control command-with-ctrl-pressed |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
123 ;; :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
|
124 ;; ;; 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
|
125 ;; :mouse-2 command-on-mouse-2-press |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
126 ;; :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
|
127 ;; |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
128 ;; 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
|
129 ;; |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
130 ;; 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
|
131 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
132 (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
|
133 "Tool bar list item." |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
134 :tag "Tool bar item" |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
135 :type '(choice |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
136 (list :tag "Command and Icon" |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
137 (function :tag "Command") |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
138 (string :tag "Icon file") |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
139 (choice |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
140 (const :tag "Default map" nil) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
141 ;; 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
|
142 (const :tag "No menu" t) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
143 (sexp :tag "Other map")) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
144 (plist :inline t :tag "Properties")) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
145 (list :tag "Separator" |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
146 (const :tag "No command" gmm-ignore) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
147 (string :tag "Icon file") |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
148 (const :tag "No map") |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
149 (plist :inline t :tag "Properties")))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
150 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
151 (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
|
152 "Tool bar zap list." |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
153 :tag "Tool bar zap list" |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
154 :type '(choice (const :tag "Zap all" t) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
155 (const :tag "Keep all" nil) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
156 (list |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
157 ;; :value |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
158 ;; Work around (bug in customize?), see |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
159 ;; <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
|
160 ;; (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
|
161 ;; print-buffer customize help) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
162 (set :inline t |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
163 (const new-file) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
164 (const open-file) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
165 (const dired) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
166 (const kill-buffer) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
167 (const save-buffer) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
168 (const write-file) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
169 (const undo) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
170 (const cut) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
171 (const copy) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
172 (const paste) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
173 (const search-forward) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
174 (const print-buffer) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
175 (const customize) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
176 (const help)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
177 (repeat :inline t |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
178 :tag "Other" |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
179 (symbol :tag "Icon item"))))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
180 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
181 ;; (defun gmm-color-cells (&optional display) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
182 ;; "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
|
183 ;; Compatibility function." |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
184 ;; ;; `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
|
185 ;; ;; > 8 in Emacs 21. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
186 ;; ;; |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
187 ;; ;; Feel free to add proper XEmacs support. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
188 ;; (let* ((cells (and (fboundp 'display-color-cells) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
189 ;; (display-color-cells display))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
190 ;; (plane (and (fboundp 'x-display-planes) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
191 ;; (ash 1 (x-display-planes)))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
192 ;; (none -1)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
193 ;; (max (if (integerp cells) cells none) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
194 ;; (if (integerp plane) plane none)))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
195 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
196 (defcustom gmm-tool-bar-style |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
197 (if (and (boundp 'tool-bar-mode) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
198 tool-bar-mode |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
199 (and (fboundp 'display-visual-class) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
200 (not (memq (display-visual-class) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
201 (list 'static-gray 'gray-scale |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
202 'static-color 'pseudo-color))))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
203 'gnome |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
204 'retro) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
205 "Prefered tool bar style." |
75149 | 206 :type '(choice (const :tag "GNOME style" gnome) |
207 (const :tag "Retro look" retro)) | |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
208 :group 'gmm) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
209 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
210 (defvar tool-bar-map) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
211 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
212 ;;;###autoload |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
213 (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
|
214 "Make a tool bar from ICON-LIST. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
215 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
216 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
|
217 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
|
218 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
|
219 <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
|
220 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
|
221 function `tool-bar-local-item'. |
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 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
|
224 `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
|
225 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
|
226 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
|
227 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
|
228 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
229 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
|
230 (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
|
231 ;; could use some other local variable. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
232 (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
|
233 (make-sparse-keymap) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
234 (copy-keymap tool-bar-map)))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
235 (when (listp zap-list) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
236 ;; 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
|
237 (dolist (key zap-list) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
238 (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
|
239 (mapc (lambda (el) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
240 (let ((command (car el)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
241 (icon (nth 1 el)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
242 (fmap (or (nth 2 el) default-map)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
243 (props (cdr (cdr (cdr el)))) ) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
244 ;; command may stem from different from-maps: |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
245 (cond ((eq command 'gmm-ignore) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
246 ;; 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
|
247 ;; widget. Suppress tooltip by adding `:enable nil'. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
248 (if (fboundp 'tool-bar-local-item) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
249 (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
|
250 tool-bar-map :enable nil props) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
251 ;; (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
|
252 ;; (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
|
253 (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
|
254 ((equal fmap t) ;; Not a menu command |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
255 (if (fboundp 'tool-bar-local-item) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
256 (apply 'tool-bar-local-item |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
257 icon command |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
258 (intern icon) ;; reuse icon or fmap here? |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
259 tool-bar-map props) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
260 ;; Emacs 21 compatibility: |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
261 (apply 'tool-bar-add-item |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
262 icon command |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
263 (intern icon) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
264 props))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
265 (t ;; A menu command |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
266 (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
|
267 (apply 'tool-bar-local-item-from-menu |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
268 ;; (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
|
269 ;; tool-bar-map props) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
270 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
|
271 props) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
272 ;; Emacs 21 compatibility: |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
273 (apply 'tool-bar-add-item-from-menu |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
274 command icon (symbol-value fmap) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
275 props)))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
276 t)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
277 (if (symbolp icon-list) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
278 (eval icon-list) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
279 icon-list)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
280 tool-bar-map)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
281 |
70720 | 282 (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
|
283 "Create function NAME. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
284 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
|
285 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
|
286 (let ((defined-p (fboundp function))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
287 (if defined-p |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
288 `(defalias ',name ',function) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
289 `(defun ,name ,arg-list ,@body)))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
290 |
70720 | 291 (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
|
292 image-search-load-path (file &optional path) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
293 "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
|
294 This function returns nil on those systems." |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
295 nil) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
296 |
70720 | 297 ;; 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
|
298 |
70720 | 299 (defun-gmm gmm-image-load-path-for-library |
300 image-load-path-for-library (library image &optional path no-error) | |
301 "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
|
302 |
70720 | 303 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
|
304 \"`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
|
305 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
|
306 \"../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
|
307 in \"`data-directory'/images\". |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
308 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
309 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
|
310 first the directory in which IMAGE was found, followed by the |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
311 value of `load-path'. If PATH is given, it is used instead of |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
312 `load-path'. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
313 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
314 If NO-ERROR is non-nil and a suitable path can't be found, don't |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
315 signal an error. Instead, return a list of directories as before, |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
316 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
|
317 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
318 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
|
319 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
|
320 `image-load-path': |
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 ;; Shush compiler. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
323 (defvar image-load-path) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
324 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
325 (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
|
326 (image-load-path (cons (car load-path) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
327 (when (boundp 'image-load-path) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
328 image-load-path)))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
329 (mh-tool-bar-folder-buttons-init))" |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
330 (unless library (error "No library specified")) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
331 (unless image (error "No image specified")) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
332 (let (image-directory image-directory-load-path) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
333 ;; 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
|
334 (let ((img image) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
335 (dir (or |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
336 ;; Images in image-load-path. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
337 (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
|
338 ;; Images in load-path. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
339 (locate-library image))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
340 parent) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
341 ;; 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
|
342 ;; example, mail/attach.pbm), adjust `image-directory' |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
343 ;; accordingly. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
344 (when dir |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
345 (setq dir (file-name-directory dir)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
346 (while (setq parent (file-name-directory img)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
347 (setq img (directory-file-name parent) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
348 dir (expand-file-name "../" dir)))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
349 (setq image-directory-load-path dir)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
350 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
351 ;; If `image-directory-load-path' isn't Emacs' image directory, |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
352 ;; it's probably a user preference, so use it. Then use a |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
353 ;; relative setting if possible; otherwise, use |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
354 ;; `image-directory-load-path'. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
355 (cond |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
356 ;; User-modified image-load-path? |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
357 ((and image-directory-load-path |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
358 (not (equal image-directory-load-path |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
359 (file-name-as-directory |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
360 (expand-file-name "images" data-directory))))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
361 (setq image-directory image-directory-load-path)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
362 ;; Try relative setting. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
363 ((let (library-name d1ei d2ei) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
364 ;; First, find library in the load-path. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
365 (setq library-name (locate-library library)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
366 (if (not library-name) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
367 (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
|
368 ;; 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
|
369 (setq |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
370 ;; Go down 2 levels. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
371 d2ei (file-name-as-directory |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
372 (expand-file-name |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
373 (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
|
374 ;; Go down 1 level. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
375 d1ei (file-name-as-directory |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
376 (expand-file-name |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
377 (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
|
378 (setq image-directory |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
379 ;; 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
|
380 (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
|
381 ((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
|
382 ;; Use Emacs' image directory. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
383 (image-directory-load-path |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
384 (setq image-directory image-directory-load-path)) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
385 (no-error |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
386 (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
|
387 (t |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
388 (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
|
389 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
390 ;; Return an augmented `path' or `load-path'. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
391 (nconc (list image-directory) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
392 (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
|
393 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
394 (defun gmm-customize-mode (&optional mode) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
395 "Customize customization group for MODE. |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
396 If mode is nil, use `major-mode' of the curent buffer." |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
397 (interactive) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
398 (customize-group |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
399 (or mode |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
400 (intern (let ((mode (symbol-name major-mode))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
401 (string-match "^\\(.+\\)-mode$" mode) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
402 (match-string 1 mode)))))) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
403 |
73370 | 404 (defun gmm-write-region (start end filename &optional append visit |
405 lockname mustbenew) | |
406 "Compatibility function for `write-region'. | |
407 | |
408 In XEmacs, the seventh argument of `write-region' specifies the | |
409 coding-system." | |
410 (if (and mustbenew | |
411 (or (featurep 'xemacs) | |
412 (= emacs-major-version 20))) | |
413 (if (file-exists-p filename) | |
414 (signal 'file-already-exists | |
415 (list "File exists" filename)) | |
416 (write-region start end filename append visit lockname)) | |
417 (write-region start end filename append visit lockname mustbenew))) | |
418 | |
70051
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
419 (provide 'gmm-utils) |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
420 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
421 ;; arch-tag: e0b60920-2ce6-40c1-bfc0-cadbbe26b602 |
700b1f9b81e2
[ Merge Gnome tool bars from Gnus trunk ]
Reiner Steib <Reiner.Steib@gmx.de>
parents:
diff
changeset
|
422 ;;; gmm-utils.el ends here |