diff options
| author | Juanma Barranquero | 2007-10-08 14:48:39 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2007-10-08 14:48:39 +0000 |
| commit | 3d0910ae255524a0b2eafb6ca881cb122bdebc03 (patch) | |
| tree | ab6e4a6bcdd9707abe988bf19d4ae0c1555e277a | |
| parent | aa0c48db78de0b9e1cb42a6eca76efbf11e32048 (diff) | |
| download | emacs-3d0910ae255524a0b2eafb6ca881cb122bdebc03.tar.gz emacs-3d0910ae255524a0b2eafb6ca881cb122bdebc03.zip | |
(minibuf-depth-indicator-function): New variable.
(minibuf-depth-setup-minibuffer): Use it.
| -rw-r--r-- | lisp/ChangeLog | 23 | ||||
| -rw-r--r-- | lisp/mb-depth.el | 10 |
2 files changed, 22 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 26aef67e98a..a5cfc63fee8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-10-08 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * mb-depth.el (minibuf-depth-indicator-function): New variable. | ||
| 4 | (minibuf-depth-setup-minibuffer): Use it. | ||
| 5 | |||
| 1 | 2007-10-07 Glenn Morris <rgm@gnu.org> | 6 | 2007-10-07 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * simple.el (bad-packages-alist): Clarify Semantic and CEDET | 8 | * simple.el (bad-packages-alist): Clarify Semantic and CEDET |
| @@ -34,19 +39,19 @@ | |||
| 34 | (tramp-completion-mode): New defvar. | 39 | (tramp-completion-mode): New defvar. |
| 35 | (tramp-completion-mode-p): Use it. | 40 | (tramp-completion-mode-p): Use it. |
| 36 | 41 | ||
| 37 | * net/tramp-compat.el (top): Load tramp-util.el and tramp-vc.el. | 42 | * net/tramp-compat.el (top): Load tramp-util.el and tramp-vc.el. |
| 38 | 43 | ||
| 39 | * net/tramp-fish.el (tramp-fish-handle-process-file): Rewrite | 44 | * net/tramp-fish.el (tramp-fish-handle-process-file): Rewrite |
| 40 | temporary file handling. | 45 | temporary file handling. |
| 41 | 46 | ||
| 42 | 2007-10-06 Eric S. Raymond <esr@snark.thyrsus.com> | 47 | 2007-10-06 Eric S. Raymond <esr@snark.thyrsus.com> |
| 43 | 48 | ||
| 44 | * vc.el: workfile version -> focus version change. Port various | 49 | * vc.el: Workfile version -> focus version change. Port various |
| 45 | comments from new VC to reduce the noise in the diff. | 50 | comments from new VC to reduce the noise in the diff. |
| 46 | Patch in the new vc-create-repo function to go with the | 51 | Patch in the new vc-create-repo function to go with the |
| 47 | header comment about it already present. | 52 | header comment about it already present. |
| 48 | There are changes to existing logic in this patch. | 53 | There are changes to existing logic in this patch. |
| 49 | *vc.el (vc-revert-buffer1): Rename to to vc-revert-buffer-internal. | 54 | (vc-revert-buffer1): Rename to vc-revert-buffer-internal. |
| 50 | 55 | ||
| 51 | 2007-10-06 Aaron Hawley <aaronh@garden.org> | 56 | 2007-10-06 Aaron Hawley <aaronh@garden.org> |
| 52 | 57 | ||
| @@ -59,12 +64,12 @@ | |||
| 59 | 2007-10-05 John W. Eaton <jwe@octave.org> | 64 | 2007-10-05 John W. Eaton <jwe@octave.org> |
| 60 | 65 | ||
| 61 | * progmodes/octave-mod.el (octave-abbrev-table): Add "until". | 66 | * progmodes/octave-mod.el (octave-abbrev-table): Add "until". |
| 62 | (octave-begin-keywords): Add "do". | 67 | (octave-begin-keywords): Add "do". |
| 63 | (octave-end-keywords): Remove "end". | 68 | (octave-end-keywords): Remove "end". |
| 64 | (octave-reserved-words): Add "end". Remove "all_va_args", | 69 | (octave-reserved-words): Add "end". Remove "all_va_args", |
| 65 | "gplot", and 'gsplot". | 70 | "gplot", and 'gsplot". |
| 66 | (octave-text-functions): Remove "gset", "gshow", "set", and "show". | 71 | (octave-text-functions): Remove "gset", "gshow", "set", and "show". |
| 67 | (octave-variables): Remove "IMAGEPATH", "INFO_FILE", | 72 | (octave-variables): Remove "IMAGEPATH", "INFO_FILE", |
| 68 | "INFO_PROGRAM", "LOADPATH", "__error_text__", "automatic_replot", | 73 | "INFO_PROGRAM", "LOADPATH", "__error_text__", "automatic_replot", |
| 69 | "default_return_value", "define_all_return_values", | 74 | "default_return_value", "define_all_return_values", |
| 70 | "do_fortran_indexing", "empty_list_elements_ok", | 75 | "do_fortran_indexing", "empty_list_elements_ok", |
| @@ -78,7 +83,7 @@ | |||
| 78 | Add "DEFAULT_EXEC_PATH", "DEFAULT_LOADPATH", "IMAGE_PATH", | 83 | Add "DEFAULT_EXEC_PATH", "DEFAULT_LOADPATH", "IMAGE_PATH", |
| 79 | "crash_dumps_octave_core", "sighup_dumps_octave_core", | 84 | "crash_dumps_octave_core", "sighup_dumps_octave_core", |
| 80 | "sigterm_dumps_octave_core". | 85 | "sigterm_dumps_octave_core". |
| 81 | (octave-block-match-alist): Remove "end" from block-end keywords. | 86 | (octave-block-match-alist): Remove "end" from block-end keywords. |
| 82 | (octave-mode): Update ftp site address. | 87 | (octave-mode): Update ftp site address. |
| 83 | 88 | ||
| 84 | 2007-10-05 Dan Nicolaescu <dann@ics.uci.edu> | 89 | 2007-10-05 Dan Nicolaescu <dann@ics.uci.edu> |
diff --git a/lisp/mb-depth.el b/lisp/mb-depth.el index 1d125e45d95..c1fd0780730 100644 --- a/lisp/mb-depth.el +++ b/lisp/mb-depth.el | |||
| @@ -32,6 +32,11 @@ | |||
| 32 | 32 | ||
| 33 | ;;; Code: | 33 | ;;; Code: |
| 34 | 34 | ||
| 35 | (defvar minibuf-depth-indicator-function nil | ||
| 36 | "If non-nil, function to set up the minibuffer depth indicator. | ||
| 37 | It is called with one argument, the minibuffer depth, | ||
| 38 | and must return a string.") | ||
| 39 | |||
| 35 | ;; An overlay covering the prompt. This is a buffer-local variable in | 40 | ;; An overlay covering the prompt. This is a buffer-local variable in |
| 36 | ;; each affected minibuffer. | 41 | ;; each affected minibuffer. |
| 37 | ;; | 42 | ;; |
| @@ -45,8 +50,9 @@ The prompt should already have been inserted." | |||
| 45 | (when (> (minibuffer-depth) 1) | 50 | (when (> (minibuffer-depth) 1) |
| 46 | (setq minibuf-depth-overlay (make-overlay (point-min) (1+ (point-min)))) | 51 | (setq minibuf-depth-overlay (make-overlay (point-min) (1+ (point-min)))) |
| 47 | (overlay-put minibuf-depth-overlay 'before-string | 52 | (overlay-put minibuf-depth-overlay 'before-string |
| 48 | (propertize (format "[%d]" (minibuffer-depth)) | 53 | (if minibuf-depth-indicator-function |
| 49 | 'face 'highlight)) | 54 | (funcall minibuf-depth-indicator-function (minibuffer-depth)) |
| 55 | (propertize (format "[%d]" (minibuffer-depth)) 'face 'highlight))) | ||
| 50 | (overlay-put minibuf-depth-overlay 'evaporate t))) | 56 | (overlay-put minibuf-depth-overlay 'evaporate t))) |
| 51 | 57 | ||
| 52 | ;;;###autoload | 58 | ;;;###autoload |