From 3d0910ae255524a0b2eafb6ca881cb122bdebc03 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Mon, 8 Oct 2007 14:48:39 +0000 Subject: [PATCH] (minibuf-depth-indicator-function): New variable. (minibuf-depth-setup-minibuffer): Use it. --- lisp/ChangeLog | 23 ++++++++++++++--------- 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 @@ +2007-10-08 Juanma Barranquero + + * mb-depth.el (minibuf-depth-indicator-function): New variable. + (minibuf-depth-setup-minibuffer): Use it. + 2007-10-07 Glenn Morris * simple.el (bad-packages-alist): Clarify Semantic and CEDET @@ -34,19 +39,19 @@ (tramp-completion-mode): New defvar. (tramp-completion-mode-p): Use it. - * net/tramp-compat.el (top): Load tramp-util.el and tramp-vc.el. + * net/tramp-compat.el (top): Load tramp-util.el and tramp-vc.el. * net/tramp-fish.el (tramp-fish-handle-process-file): Rewrite temporary file handling. 2007-10-06 Eric S. Raymond - * vc.el: workfile version -> focus version change. Port various + * vc.el: Workfile version -> focus version change. Port various comments from new VC to reduce the noise in the diff. Patch in the new vc-create-repo function to go with the header comment about it already present. There are changes to existing logic in this patch. - *vc.el (vc-revert-buffer1): Rename to to vc-revert-buffer-internal. + (vc-revert-buffer1): Rename to vc-revert-buffer-internal. 2007-10-06 Aaron Hawley @@ -59,12 +64,12 @@ 2007-10-05 John W. Eaton * progmodes/octave-mod.el (octave-abbrev-table): Add "until". - (octave-begin-keywords): Add "do". - (octave-end-keywords): Remove "end". - (octave-reserved-words): Add "end". Remove "all_va_args", + (octave-begin-keywords): Add "do". + (octave-end-keywords): Remove "end". + (octave-reserved-words): Add "end". Remove "all_va_args", "gplot", and 'gsplot". - (octave-text-functions): Remove "gset", "gshow", "set", and "show". - (octave-variables): Remove "IMAGEPATH", "INFO_FILE", + (octave-text-functions): Remove "gset", "gshow", "set", and "show". + (octave-variables): Remove "IMAGEPATH", "INFO_FILE", "INFO_PROGRAM", "LOADPATH", "__error_text__", "automatic_replot", "default_return_value", "define_all_return_values", "do_fortran_indexing", "empty_list_elements_ok", @@ -78,7 +83,7 @@ Add "DEFAULT_EXEC_PATH", "DEFAULT_LOADPATH", "IMAGE_PATH", "crash_dumps_octave_core", "sighup_dumps_octave_core", "sigterm_dumps_octave_core". - (octave-block-match-alist): Remove "end" from block-end keywords. + (octave-block-match-alist): Remove "end" from block-end keywords. (octave-mode): Update ftp site address. 2007-10-05 Dan Nicolaescu 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 @@ ;;; Code: +(defvar minibuf-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.") + ;; An overlay covering the prompt. This is a buffer-local variable in ;; each affected minibuffer. ;; @@ -45,8 +50,9 @@ 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 - (propertize (format "[%d]" (minibuffer-depth)) - 'face 'highlight)) + (if minibuf-depth-indicator-function + (funcall minibuf-depth-indicator-function (minibuffer-depth)) + (propertize (format "[%d]" (minibuffer-depth)) 'face 'highlight))) (overlay-put minibuf-depth-overlay 'evaporate t))) ;;;###autoload -- 2.39.5