mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-30 04:10:54 -08:00
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'.
This commit is contained in:
parent
8938c0bc9c
commit
e94d064572
3 changed files with 61 additions and 18 deletions
15
etc/NEWS
15
etc/NEWS
|
|
@ -189,6 +189,10 @@ Sinhala, and TaiViet.
|
|||
*** The minor modes unify-8859-on-encoding-mode and
|
||||
unify-8859-on-decoding-mode are obsolete.
|
||||
|
||||
*** `ucs-insert' is bound to `C-x 8 RET' and in addition to hex numbers
|
||||
accepts numbers in hash notation (e.g. #o21430 for octal, or #10r8984 for
|
||||
decimal). It also accepts Unicode character names with completion.
|
||||
|
||||
** Emacs now supports serial port access on GNU/Linux, Unix, and
|
||||
Windows. The new command `serial-term' starts an interactive terminal
|
||||
on a serial port. The serial port can be configured at runtime with
|
||||
|
|
@ -261,6 +265,12 @@ on the regexp command prefix map.
|
|||
list accessible by M-n instead of pushing all guesses temporarily into
|
||||
the history list.
|
||||
|
||||
** In Isearch mode, a special case of typing `C-w' at the beginning of
|
||||
the minibuffer that toggles word search (i.e. using key sequences
|
||||
`C-s RET C-w' or `C-s M-e C-w') is obsolete. You can use the global key
|
||||
`M-s w' to start word search, or type `M-s w' in Isearch mode to
|
||||
toggle word search.
|
||||
|
||||
---
|
||||
** The following input methods were removed in Emacs 22.2, but this was
|
||||
not advertised: danish-alt-postfix, esperanto-alt-postfix,
|
||||
|
|
@ -476,7 +486,7 @@ display the search results with Rmail, Gnus and VM. Note that there
|
|||
is an existing Gnus back end, nnmairix.el, which should be used with
|
||||
Maildir/MH setups.
|
||||
|
||||
** minibuffer-indicate-depth-mode shows the minibuffer depth in the prompt.
|
||||
** minibuffer-depth-indicate-mode shows the minibuffer depth in the prompt.
|
||||
|
||||
** nXML Mode
|
||||
This is a new mode for editing XML documents. It allows a schema to
|
||||
|
|
@ -642,7 +652,8 @@ Command*'.
|
|||
*** `M-s f C-s' and `M-s f M-C-s' run Isearch that matches only at file names.
|
||||
When a new user option `dired-isearch-filenames' is non-nil, then even
|
||||
ordinary Isearch started with `C-s' and `C-M-s' matches only at file names
|
||||
in the Dired buffer.
|
||||
in the Dired buffer. You can toggle file names matching on or off
|
||||
by typing `M-s f' in Isearch mode.
|
||||
|
||||
*** `M-s a C-s' and `M-s a M-C-s' run multi-file Isearch on the marked files.
|
||||
They visit the first marked file in the sequence and display the usual Isearch
|
||||
|
|
|
|||
|
|
@ -1,3 +1,35 @@
|
|||
2008-07-31 Juri Linkov <juri@jurta.org>
|
||||
|
||||
* dired-aux.el (dired-do-chmod): Set default value to the original
|
||||
mode string using absolute notation like u=rwx,g=rx,o=rx.
|
||||
Use it as a new arg `default' of `dired-mark-read-string'.
|
||||
(dired-mark-read-string): Add new optional arg `default'.
|
||||
|
||||
* files.el (read-file-modes): Set default value to the original
|
||||
mode string using absolute notation like u=rwx,g=rx,o=rx.
|
||||
Use it as the `default' arg of `read-string'.
|
||||
|
||||
* filesets.el (filesets-cmd-isearch-getargs): Check if the
|
||||
variable `files' is bound to avoid warnings.
|
||||
|
||||
* isearch.el (isearch-forward-regexp, isearch-forward-word)
|
||||
(isearch-backward, isearch-backward-regexp): Doc fix - make a link
|
||||
to the command `isearch-forward' instead of displaying "See C-s".
|
||||
(isearch-highlight-regexp): Remove arguments `regexp' and `face'
|
||||
with their interactive specifictions. Move reading the face name to
|
||||
the main body after calls to isearch-done and isearch-clean-overlays.
|
||||
|
||||
* mb-depth.el: 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'.
|
||||
|
||||
2008-07-31 Juri Linkov <juri@jurta.org>
|
||||
|
||||
* dired-aux.el (dired-isearch-filenames-toggle): New command.
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
;;; Commentary:
|
||||
;;
|
||||
;; Defines the minor mode `minibuffer-indicate-depth-mode'.
|
||||
;; Defines the minor mode `minibuffer-depth-indicate-mode'.
|
||||
;;
|
||||
;; When active, any recursive use of the minibuffer will show
|
||||
;; the recursion depth in the minibuffer prompt. This is only
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
;;; Code:
|
||||
|
||||
(defvar minibuf-depth-indicator-function nil
|
||||
(defvar minibuffer-depth-indicator-function nil
|
||||
"If non-nil, function to set up the minibuffer depth indicator.
|
||||
It is called with one argument, the minibuffer depth,
|
||||
and must return a string.")
|
||||
|
|
@ -38,24 +38,24 @@ and must return a string.")
|
|||
;; An overlay covering the prompt. This is a buffer-local variable in
|
||||
;; each affected minibuffer.
|
||||
;;
|
||||
(defvar minibuf-depth-overlay)
|
||||
(make-variable-buffer-local 'minibuf-depth-overlay)
|
||||
(defvar minibuffer-depth-overlay)
|
||||
(make-variable-buffer-local 'minibuffer-depth-overlay)
|
||||
|
||||
;; This function goes on minibuffer-setup-hook
|
||||
(defun minibuf-depth-setup-minibuffer ()
|
||||
"Set up a minibuffer for `minibuffer-indicate-depth-mode'.
|
||||
(defun minibuffer-depth-setup ()
|
||||
"Set up a minibuffer for `minibuffer-depth-indicate-mode'.
|
||||
The prompt should already have been inserted."
|
||||
(when (> (minibuffer-depth) 1)
|
||||
(setq minibuf-depth-overlay (make-overlay (point-min) (1+ (point-min))))
|
||||
(overlay-put minibuf-depth-overlay 'before-string
|
||||
(if minibuf-depth-indicator-function
|
||||
(funcall minibuf-depth-indicator-function (minibuffer-depth))
|
||||
(setq minibuffer-depth-overlay (make-overlay (point-min) (1+ (point-min))))
|
||||
(overlay-put minibuffer-depth-overlay 'before-string
|
||||
(if minibuffer-depth-indicator-function
|
||||
(funcall minibuffer-depth-indicator-function (minibuffer-depth))
|
||||
(propertize (format "[%d]" (minibuffer-depth)) 'face 'highlight)))
|
||||
(overlay-put minibuf-depth-overlay 'evaporate t)))
|
||||
(overlay-put minibuffer-depth-overlay 'evaporate t)))
|
||||
|
||||
;;;###autoload
|
||||
(define-minor-mode minibuffer-indicate-depth-mode
|
||||
"Toggle Minibuffer Indicate Depth mode.
|
||||
(define-minor-mode minibuffer-depth-indicate-mode
|
||||
"Toggle Minibuffer Depth Indication mode.
|
||||
When active, any recursive use of the minibuffer will show
|
||||
the recursion depth in the minibuffer prompt. This is only
|
||||
useful if `enable-recursive-minibuffers' is non-nil.
|
||||
|
|
@ -64,11 +64,11 @@ With prefix argument ARG, turn on if positive, otherwise off.
|
|||
Returns non-nil if the new state is enabled."
|
||||
:global t
|
||||
:group 'minibuffer
|
||||
(if minibuffer-indicate-depth-mode
|
||||
(if minibuffer-depth-indicate-mode
|
||||
;; Enable the mode
|
||||
(add-hook 'minibuffer-setup-hook 'minibuf-depth-setup-minibuffer)
|
||||
(add-hook 'minibuffer-setup-hook 'minibuffer-depth-setup)
|
||||
;; Disable the mode
|
||||
(remove-hook 'minibuffer-setup-hook 'minibuf-depth-setup-minibuffer)))
|
||||
(remove-hook 'minibuffer-setup-hook 'minibuffer-depth-setup)))
|
||||
|
||||
(provide 'mb-depth)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue