diff options
| author | Jan D <jan.h.d@swipnet.se> | 2015-04-26 13:55:01 +0200 |
|---|---|---|
| committer | Jan D <jan.h.d@swipnet.se> | 2015-04-26 13:55:01 +0200 |
| commit | f92ac2e82ed199d6f25d2a59508e08addb1150ac (patch) | |
| tree | d7d7756e3dbce10d8f73c27815d815499f78c2bd /lisp/progmodes/xref.el | |
| parent | 5a094119ce79723108abd90a1fcc33721e964823 (diff) | |
| parent | a40869789fc5502e3d4e393b7c31d78cb7f29aa1 (diff) | |
| download | emacs-f92ac2e82ed199d6f25d2a59508e08addb1150ac.tar.gz emacs-f92ac2e82ed199d6f25d2a59508e08addb1150ac.tar.bz2 emacs-f92ac2e82ed199d6f25d2a59508e08addb1150ac.zip | |
Merge branch 'master' into cairo
Diffstat (limited to 'lisp/progmodes/xref.el')
| -rw-r--r-- | lisp/progmodes/xref.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index fe72b3f778c..0257210a6c7 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -279,9 +279,9 @@ backward." (defvar xref--marker-ring (make-ring xref-marker-ring-length) "Ring of markers to implement the marker stack.") -(defun xref-push-marker-stack () - "Add point to the marker stack." - (ring-insert xref--marker-ring (point-marker))) +(defun xref-push-marker-stack (&optional m) + "Add point M (defaults to `point-marker') to the marker stack." + (ring-insert xref--marker-ring (or m (point-marker)))) ;;;###autoload (defun xref-pop-marker-stack () @@ -562,8 +562,8 @@ Return an alist of the form ((FILENAME . (XREF ...)) ...)." (cond ((or current-prefix-arg (not id)) (completing-read prompt (funcall xref-identifier-completion-table-function) - nil t id - 'xref--read-identifier-history)) + nil t nil + 'xref--read-identifier-history id)) (t id)))) |