diff options
Diffstat (limited to 'lisp/bookmark.el')
| -rw-r--r-- | lisp/bookmark.el | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/lisp/bookmark.el b/lisp/bookmark.el index 36a361c3f4b..8a3bcf8e59d 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el | |||
| @@ -923,8 +923,6 @@ annotations." | |||
| 923 | "# Date: " (current-time-string) "\n")) | 923 | "# Date: " (current-time-string) "\n")) |
| 924 | 924 | ||
| 925 | 925 | ||
| 926 | (define-obsolete-variable-alias 'bookmark-read-annotation-text-func | ||
| 927 | 'bookmark-edit-annotation-text-func "23.1") | ||
| 928 | (defvar bookmark-edit-annotation-text-func 'bookmark-default-annotation-text | 926 | (defvar bookmark-edit-annotation-text-func 'bookmark-default-annotation-text |
| 929 | "Function to return default text to use for a bookmark annotation. | 927 | "Function to return default text to use for a bookmark annotation. |
| 930 | It takes one argument, the name of the bookmark, as a string.") | 928 | It takes one argument, the name of the bookmark, as a string.") |
| @@ -1143,17 +1141,6 @@ DISPLAY-FUNC would be `switch-to-buffer-other-window'." | |||
| 1143 | (let ((pop-up-frames t)) | 1141 | (let ((pop-up-frames t)) |
| 1144 | (bookmark-jump-other-window bookmark))) | 1142 | (bookmark-jump-other-window bookmark))) |
| 1145 | 1143 | ||
| 1146 | (defun bookmark-jump-noselect (bookmark) | ||
| 1147 | "Return the location pointed to by BOOKMARK (see `bookmark-jump'). | ||
| 1148 | The return value has the form (BUFFER . POINT). | ||
| 1149 | |||
| 1150 | Note: this function is deprecated and is present for Emacs 22 | ||
| 1151 | compatibility only." | ||
| 1152 | (declare (obsolete bookmark-handle-bookmark "23.1")) | ||
| 1153 | (save-excursion | ||
| 1154 | (bookmark-handle-bookmark bookmark) | ||
| 1155 | (cons (current-buffer) (point)))) | ||
| 1156 | |||
| 1157 | (defun bookmark-handle-bookmark (bookmark-name-or-record) | 1144 | (defun bookmark-handle-bookmark (bookmark-name-or-record) |
| 1158 | "Call BOOKMARK-NAME-OR-RECORD's handler or `bookmark-default-handler' | 1145 | "Call BOOKMARK-NAME-OR-RECORD's handler or `bookmark-default-handler' |
| 1159 | if it has none. This changes current buffer and point and returns nil, | 1146 | if it has none. This changes current buffer and point and returns nil, |