Mercurial > emacs
annotate lisp/echistory.el @ 109566:d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
* lisp/cus-start.el (tool-bar-style): Add text-image-horiz.
* src/gtkutil.c (xg_make_tool_item, xg_show_toolbar_item): Handle tool bar
style text_image_horiz.
* src/lisp.h (Qtext_image_horiz): Declare.
* src/xdisp.c (Qtext_image_horiz): Define.
(syms_of_xdisp): Initialize Qtext_image_horiz. Add text-image-horiz
to ducumentation of tool-bar-style.
* src/xsettings.c (Ftool_bar_get_system_style): Also check for
Qtext_image_horiz.
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Wed, 28 Jul 2010 19:34:51 +0200 |
parents | 1d1d5d9bd884 |
children | 376148b31b5e |
rev | line source |
---|---|
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
258
diff
changeset
|
1 ;;; echistory.el --- Electric Command History Mode |
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
258
diff
changeset
|
2 |
74439 | 3 ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, |
106815 | 4 ;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
807
diff
changeset
|
5 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
662
diff
changeset
|
6 ;; Author: K. Shane Hartman |
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
662
diff
changeset
|
7 ;; Maintainer: FSF |
198 | 8 |
9 ;; This file is part of GNU Emacs. | |
10 | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
11 ;; GNU Emacs is free software: you can redistribute it and/or modify |
198 | 12 ;; it under the terms of the GNU General Public License as published by |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
13 ;; the Free Software Foundation, either version 3 of the License, or |
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
14 ;; (at your option) any later version. |
198 | 15 |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
198 | 23 |
38412
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
27064
diff
changeset
|
24 ;;; Commentary: |
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
27064
diff
changeset
|
25 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
662
diff
changeset
|
26 ;;; Code: |
198 | 27 |
28 (require 'electric) ; command loop | |
29 (require 'chistory) ; history lister | |
30 | |
258 | 31 ;;;###autoload |
198 | 32 (defun Electric-command-history-redo-expression (&optional noconfirm) |
33 "Edit current history line in minibuffer and execute result. | |
34 With prefix arg NOCONFIRM, execute current line as-is without editing." | |
35 (interactive "P") | |
36 (let (todo) | |
105994
009383a57ce8
* x-dnd.el (x-dnd-maybe-call-test-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
100908
diff
changeset
|
37 (with-current-buffer "*Command History*" |
198 | 38 (beginning-of-line) |
39 (setq todo (read (current-buffer))) | |
40 (if (boundp 'electric-history-in-progress) | |
41 (if todo (throw 'electric-history-quit (list noconfirm todo))))))) | |
42 | |
95537
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
43 (defvar electric-history-map |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
44 (let ((map (make-sparse-keymap))) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
45 (define-key map [t] 'Electric-history-undefined) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
46 (define-key map "\e" (make-sparse-keymap)) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
47 (define-key map [?\e t] 'Electric-history-undefined) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
48 (define-key map "\C-u" 'universal-argument) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
49 (define-key map " " 'Electric-command-history-redo-expression) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
50 (define-key map "!" 'Electric-command-history-redo-expression) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
51 (define-key map "\e\C-x" 'eval-sexp) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
52 (define-key map "\e\C-d" 'down-list) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
53 (define-key map "\e\C-u" 'backward-up-list) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
54 (define-key map "\e\C-b" 'backward-sexp) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
55 (define-key map "\e\C-f" 'forward-sexp) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
56 (define-key map "\e\C-a" 'beginning-of-defun) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
57 (define-key map "\e\C-e" 'end-of-defun) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
58 (define-key map "\e\C-n" 'forward-list) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
59 (define-key map "\e\C-p" 'backward-list) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
60 (define-key map "q" 'Electric-history-quit) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
61 (define-key map "\C-c" nil) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
62 (define-key map "\C-c\C-c" 'Electric-history-quit) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
63 (define-key map "\C-]" 'Electric-history-quit) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
64 (define-key map "\C-z" 'suspend-frame) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
65 (define-key map (char-to-string help-char) 'Helper-help) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
66 (define-key map "?" 'Helper-describe-bindings) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
67 (define-key map "\e>" 'end-of-buffer) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
68 (define-key map "\e<" 'beginning-of-buffer) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
69 (define-key map "\n" 'next-line) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
70 (define-key map "\r" 'next-line) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
71 (define-key map "\177" 'previous-line) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
72 (define-key map "\C-n" 'next-line) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
73 (define-key map "\C-p" 'previous-line) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
74 (define-key map "\ev" 'scroll-down) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
75 (define-key map "\C-v" 'scroll-up) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
76 (define-key map [home] 'beginning-of-buffer) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
77 (define-key map [down] 'next-line) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
78 (define-key map [up] 'previous-line) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
79 (define-key map [prior] 'scroll-down) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
80 (define-key map [next] 'scroll-up) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
81 (define-key map "\C-l" 'recenter) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
82 (define-key map "\e\C-v" 'scroll-other-window) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
83 map) |
d5cfdf662741
(electric-history-map): Define within defvar. Add docstring.
John Paul Wallington <jpw@pobox.com>
parents:
94678
diff
changeset
|
84 "Keymap for Electric Command History mode.") |
198 | 85 |
86 (defvar electric-command-history-hook nil | |
87 "If non-nil, its value is called by `electric-command-history'.") | |
88 | |
89 (defun electric-command-history () | |
90 "\\<electric-history-map>Major mode for examining and redoing commands from `command-history'. | |
91 This pops up a window with the Command History listing. | |
92 The number of command listed is controlled by `list-command-history-max'. | |
93 The command history is filtered by `list-command-history-filter' if non-nil. | |
94 Combines typeout Command History list window with menu like selection | |
95 of an expression from the history for re-evaluation in the *original* buffer. | |
96 | |
97 The history displayed is filtered by `list-command-history-filter' if non-nil. | |
98 | |
99 Like Emacs-Lisp mode except that characters do not insert themselves and | |
100 Tab and Linefeed do not indent. Instead these commands are provided: | |
101 \\{electric-history-map} | |
102 | |
103 Calls the value of `electric-command-history-hook' if that is non-nil. | |
104 The Command History listing is recomputed each time this mode is invoked." | |
105 (interactive) | |
106 (let ((electric-history-in-progress t) | |
107 (old-buffer (current-buffer)) | |
108 (todo)) | |
109 (unwind-protect | |
110 (setq todo | |
111 (catch 'electric-history-quit | |
112 (save-window-excursion | |
113 (save-window-excursion | |
114 (list-command-history) | |
115 (set-buffer "*Command History*") | |
27064
9a83b898793c
(electric-command-history): Call Command-history-setup
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
116 (Command-history-setup) |
9a83b898793c
(electric-command-history): Call Command-history-setup
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
117 (setq major-mode 'electric-command-history) |
9a83b898793c
(electric-command-history): Call Command-history-setup
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
118 (setq mode-name "Electric History") |
9a83b898793c
(electric-command-history): Call Command-history-setup
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
119 (use-local-map electric-history-map)) |
198 | 120 (Electric-pop-up-window "*Command History*") |
121 (run-hooks 'electric-command-history-hook) | |
122 (if (eobp) | |
123 (progn (ding) | |
124 (message "No command history.") | |
125 (throw 'electric-history-quit nil)) | |
126 (let ((Helper-return-blurb "return to History")) | |
127 (Electric-command-loop 'electric-history-quit | |
128 "->" t)))))) | |
129 (set-buffer "*Command History*") | |
27064
9a83b898793c
(electric-command-history): Call Command-history-setup
Richard M. Stallman <rms@gnu.org>
parents:
18383
diff
changeset
|
130 (command-history-mode) |
198 | 131 (bury-buffer (current-buffer))) |
132 (if (consp todo) | |
133 (progn (set-buffer old-buffer) | |
134 (if (car todo) | |
135 (apply (car (car (cdr todo))) (cdr (car (cdr todo)))) | |
136 (edit-and-eval-command "Redo: " (car (cdr todo)))))))) | |
137 | |
138 (defun Electric-history-undefined () | |
139 (interactive) | |
140 (ding) | |
65582
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
64762
diff
changeset
|
141 (message "%s" (substitute-command-keys "Type \\[Helper-help] for help, ? for commands, C-c C-c to quit, Space to execute")) |
198 | 142 (sit-for 4)) |
143 | |
144 (defun Electric-history-quit () | |
145 "Quit Electric Command History, restoring previous window configuration." | |
146 (interactive) | |
147 (if (boundp 'electric-history-in-progress) | |
148 (progn (message "") | |
149 (throw 'electric-history-quit nil)))) | |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
258
diff
changeset
|
150 |
18383 | 151 (provide 'echistory) |
152 | |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
153 ;; arch-tag: 1e5018fe-190f-44a7-9109-a895dcac4c50 |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
258
diff
changeset
|
154 ;;; echistory.el ends here |