aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2010-04-14 11:24:17 -0400
committerStefan Monnier2010-04-14 11:24:17 -0400
commit38111a5adc942318efa24ae30ac98b369202f5ea (patch)
treeb406cfe2ff9fa972324d14d913936502a7b58b17
parentebb9641fb29728e9fbba70cb27f2d42679e32de7 (diff)
downloademacs-38111a5adc942318efa24ae30ac98b369202f5ea.tar.gz
emacs-38111a5adc942318efa24ae30ac98b369202f5ea.zip
(non-essential): New var.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/simple.el8
2 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b9e8ea511e6..f2330b0763c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12010-04-14 Stefan Monnier <monnier@iro.umontreal.ca> 12010-04-14 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * simple.el (non-essential): New var.
4
3 Add a new field `location' to bookmarks for non-file bookmarks. 5 Add a new field `location' to bookmarks for non-file bookmarks.
4 * bookmark.el (bookmark-location): Use the new field, if present. 6 * bookmark.el (bookmark-location): Use the new field, if present.
5 (bookmark-insert-location): Undo last change, not needed any more. 7 (bookmark-insert-location): Undo last change, not needed any more.
diff --git a/lisp/simple.el b/lisp/simple.el
index 34e31b10276..d071c76e2b1 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3940,6 +3940,14 @@ the current accessible part of the buffer.
3940If `widen-automatically' is nil, these commands will do something else 3940If `widen-automatically' is nil, these commands will do something else
3941as a fallback, and won't change the buffer bounds.") 3941as a fallback, and won't change the buffer bounds.")
3942 3942
3943(defvar non-essential nil
3944 "Whether the currently executing code is performing an essential task.
3945This variable should be non-nil only when running code which should not
3946disturb the user. E.g. it can be used to prevent Tramp from prompting the
3947user for a password when we are simply scanning a set of files in the
3948background or displaying possible completions before the user even asked
3949for it.")
3950
3943(defun pop-global-mark () 3951(defun pop-global-mark ()
3944 "Pop off global mark ring and jump to the top location." 3952 "Pop off global mark ring and jump to the top location."
3945 (interactive) 3953 (interactive)