aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2008-07-31 17:23:45 +0000
committerJuri Linkov2008-07-31 17:23:45 +0000
commite94d06457259eaf5b52c8f058dcc375c9ef840bd (patch)
tree4bacb5c56c5787ceca778c38145ad87f19b451f5
parent8938c0bc9c82fd25186d5e23da83dee696738c22 (diff)
downloademacs-e94d06457259eaf5b52c8f058dcc375c9ef840bd.tar.gz
emacs-e94d06457259eaf5b52c8f058dcc375c9ef840bd.zip
Unify all names under one common name prefix
`minibuffer-depth-'. (minibuffer-depth-indicator-function): Renamed from `minibuf-depth-indicator-function'. (minibuffer-depth-overlay): Renamed from `minibuf-depth-overlay'. (minibuffer-depth-setup): Renamed from `minibuf-depth-setup-minibuffer'. (minibuffer-depth-indicate-mode): Renamed from `minibuffer-indicate-depth-mode'.
-rw-r--r--etc/NEWS15
-rw-r--r--lisp/ChangeLog32
-rw-r--r--lisp/mb-depth.el32
3 files changed, 61 insertions, 18 deletions
diff --git a/etc/NEWS b/etc/NEWS
index f456712a17b..85f88bbb8ea 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -189,6 +189,10 @@ Sinhala, and TaiViet.
189*** The minor modes unify-8859-on-encoding-mode and 189*** The minor modes unify-8859-on-encoding-mode and
190unify-8859-on-decoding-mode are obsolete. 190unify-8859-on-decoding-mode are obsolete.
191 191
192*** `ucs-insert' is bound to `C-x 8 RET' and in addition to hex numbers
193accepts numbers in hash notation (e.g. #o21430 for octal, or #10r8984 for
194decimal). It also accepts Unicode character names with completion.
195
192** Emacs now supports serial port access on GNU/Linux, Unix, and 196** Emacs now supports serial port access on GNU/Linux, Unix, and
193Windows. The new command `serial-term' starts an interactive terminal 197Windows. The new command `serial-term' starts an interactive terminal
194on a serial port. The serial port can be configured at runtime with 198on a serial port. The serial port can be configured at runtime with
@@ -261,6 +265,12 @@ on the regexp command prefix map.
261list accessible by M-n instead of pushing all guesses temporarily into 265list accessible by M-n instead of pushing all guesses temporarily into
262the history list. 266the history list.
263 267
268** In Isearch mode, a special case of typing `C-w' at the beginning of
269the minibuffer that toggles word search (i.e. using key sequences
270`C-s RET C-w' or `C-s M-e C-w') is obsolete. You can use the global key
271`M-s w' to start word search, or type `M-s w' in Isearch mode to
272toggle word search.
273
264--- 274---
265** The following input methods were removed in Emacs 22.2, but this was 275** The following input methods were removed in Emacs 22.2, but this was
266not advertised: danish-alt-postfix, esperanto-alt-postfix, 276not advertised: danish-alt-postfix, esperanto-alt-postfix,
@@ -476,7 +486,7 @@ display the search results with Rmail, Gnus and VM. Note that there
476is an existing Gnus back end, nnmairix.el, which should be used with 486is an existing Gnus back end, nnmairix.el, which should be used with
477Maildir/MH setups. 487Maildir/MH setups.
478 488
479** minibuffer-indicate-depth-mode shows the minibuffer depth in the prompt. 489** minibuffer-depth-indicate-mode shows the minibuffer depth in the prompt.
480 490
481** nXML Mode 491** nXML Mode
482This is a new mode for editing XML documents. It allows a schema to 492This is a new mode for editing XML documents. It allows a schema to
@@ -642,7 +652,8 @@ Command*'.
642*** `M-s f C-s' and `M-s f M-C-s' run Isearch that matches only at file names. 652*** `M-s f C-s' and `M-s f M-C-s' run Isearch that matches only at file names.
643When a new user option `dired-isearch-filenames' is non-nil, then even 653When a new user option `dired-isearch-filenames' is non-nil, then even
644ordinary Isearch started with `C-s' and `C-M-s' matches only at file names 654ordinary Isearch started with `C-s' and `C-M-s' matches only at file names
645in the Dired buffer. 655in the Dired buffer. You can toggle file names matching on or off
656by typing `M-s f' in Isearch mode.
646 657
647*** `M-s a C-s' and `M-s a M-C-s' run multi-file Isearch on the marked files. 658*** `M-s a C-s' and `M-s a M-C-s' run multi-file Isearch on the marked files.
648They visit the first marked file in the sequence and display the usual Isearch 659They visit the first marked file in the sequence and display the usual Isearch
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1b950b39586..3a2222ac95c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,37 @@
12008-07-31 Juri Linkov <juri@jurta.org> 12008-07-31 Juri Linkov <juri@jurta.org>
2 2
3 * dired-aux.el (dired-do-chmod): Set default value to the original
4 mode string using absolute notation like u=rwx,g=rx,o=rx.
5 Use it as a new arg `default' of `dired-mark-read-string'.
6 (dired-mark-read-string): Add new optional arg `default'.
7
8 * files.el (read-file-modes): Set default value to the original
9 mode string using absolute notation like u=rwx,g=rx,o=rx.
10 Use it as the `default' arg of `read-string'.
11
12 * filesets.el (filesets-cmd-isearch-getargs): Check if the
13 variable `files' is bound to avoid warnings.
14
15 * isearch.el (isearch-forward-regexp, isearch-forward-word)
16 (isearch-backward, isearch-backward-regexp): Doc fix - make a link
17 to the command `isearch-forward' instead of displaying "See C-s".
18 (isearch-highlight-regexp): Remove arguments `regexp' and `face'
19 with their interactive specifictions. Move reading the face name to
20 the main body after calls to isearch-done and isearch-clean-overlays.
21
22 * mb-depth.el: Unify all names under one common name prefix
23 `minibuffer-depth-'.
24 (minibuffer-depth-indicator-function): Renamed from
25 `minibuf-depth-indicator-function'.
26 (minibuffer-depth-overlay): Renamed from
27 `minibuf-depth-overlay'.
28 (minibuffer-depth-setup): Renamed from
29 `minibuf-depth-setup-minibuffer'.
30 (minibuffer-depth-indicate-mode): Renamed from
31 `minibuffer-indicate-depth-mode'.
32
332008-07-31 Juri Linkov <juri@jurta.org>
34
3 * dired-aux.el (dired-isearch-filenames-toggle): New command. 35 * dired-aux.el (dired-isearch-filenames-toggle): New command.
4 (dired-isearch-filenames-setup): Bind "\M-sf" to 36 (dired-isearch-filenames-setup): Bind "\M-sf" to
5 dired-isearch-filenames-toggle in isearch-mode-map. 37 dired-isearch-filenames-toggle in isearch-mode-map.
diff --git a/lisp/mb-depth.el b/lisp/mb-depth.el
index c1904323893..eeb096e0bcd 100644
--- a/lisp/mb-depth.el
+++ b/lisp/mb-depth.el
@@ -22,7 +22,7 @@
22 22
23;;; Commentary: 23;;; Commentary:
24;; 24;;
25;; Defines the minor mode `minibuffer-indicate-depth-mode'. 25;; Defines the minor mode `minibuffer-depth-indicate-mode'.
26;; 26;;
27;; When active, any recursive use of the minibuffer will show 27;; When active, any recursive use of the minibuffer will show
28;; the recursion depth in the minibuffer prompt. This is only 28;; the recursion depth in the minibuffer prompt. This is only
@@ -30,7 +30,7 @@
30 30
31;;; Code: 31;;; Code:
32 32
33(defvar minibuf-depth-indicator-function nil 33(defvar minibuffer-depth-indicator-function nil
34 "If non-nil, function to set up the minibuffer depth indicator. 34 "If non-nil, function to set up the minibuffer depth indicator.
35It is called with one argument, the minibuffer depth, 35It is called with one argument, the minibuffer depth,
36and must return a string.") 36and must return a string.")
@@ -38,24 +38,24 @@ and must return a string.")
38;; An overlay covering the prompt. This is a buffer-local variable in 38;; An overlay covering the prompt. This is a buffer-local variable in
39;; each affected minibuffer. 39;; each affected minibuffer.
40;; 40;;
41(defvar minibuf-depth-overlay) 41(defvar minibuffer-depth-overlay)
42(make-variable-buffer-local 'minibuf-depth-overlay) 42(make-variable-buffer-local 'minibuffer-depth-overlay)
43 43
44;; This function goes on minibuffer-setup-hook 44;; This function goes on minibuffer-setup-hook
45(defun minibuf-depth-setup-minibuffer () 45(defun minibuffer-depth-setup ()
46 "Set up a minibuffer for `minibuffer-indicate-depth-mode'. 46 "Set up a minibuffer for `minibuffer-depth-indicate-mode'.
47The prompt should already have been inserted." 47The prompt should already have been inserted."
48 (when (> (minibuffer-depth) 1) 48 (when (> (minibuffer-depth) 1)
49 (setq minibuf-depth-overlay (make-overlay (point-min) (1+ (point-min)))) 49 (setq minibuffer-depth-overlay (make-overlay (point-min) (1+ (point-min))))
50 (overlay-put minibuf-depth-overlay 'before-string 50 (overlay-put minibuffer-depth-overlay 'before-string
51 (if minibuf-depth-indicator-function 51 (if minibuffer-depth-indicator-function
52 (funcall minibuf-depth-indicator-function (minibuffer-depth)) 52 (funcall minibuffer-depth-indicator-function (minibuffer-depth))
53 (propertize (format "[%d]" (minibuffer-depth)) 'face 'highlight))) 53 (propertize (format "[%d]" (minibuffer-depth)) 'face 'highlight)))
54 (overlay-put minibuf-depth-overlay 'evaporate t))) 54 (overlay-put minibuffer-depth-overlay 'evaporate t)))
55 55
56;;;###autoload 56;;;###autoload
57(define-minor-mode minibuffer-indicate-depth-mode 57(define-minor-mode minibuffer-depth-indicate-mode
58 "Toggle Minibuffer Indicate Depth mode. 58 "Toggle Minibuffer Depth Indication mode.
59When active, any recursive use of the minibuffer will show 59When active, any recursive use of the minibuffer will show
60the recursion depth in the minibuffer prompt. This is only 60the recursion depth in the minibuffer prompt. This is only
61useful if `enable-recursive-minibuffers' is non-nil. 61useful if `enable-recursive-minibuffers' is non-nil.
@@ -64,11 +64,11 @@ With prefix argument ARG, turn on if positive, otherwise off.
64Returns non-nil if the new state is enabled." 64Returns non-nil if the new state is enabled."
65 :global t 65 :global t
66 :group 'minibuffer 66 :group 'minibuffer
67 (if minibuffer-indicate-depth-mode 67 (if minibuffer-depth-indicate-mode
68 ;; Enable the mode 68 ;; Enable the mode
69 (add-hook 'minibuffer-setup-hook 'minibuf-depth-setup-minibuffer) 69 (add-hook 'minibuffer-setup-hook 'minibuffer-depth-setup)
70 ;; Disable the mode 70 ;; Disable the mode
71 (remove-hook 'minibuffer-setup-hook 'minibuf-depth-setup-minibuffer))) 71 (remove-hook 'minibuffer-setup-hook 'minibuffer-depth-setup)))
72 72
73(provide 'mb-depth) 73(provide 'mb-depth)
74 74