GitLab

* bookmark.el (bookmark-bmenu-2-window)
(bookmark-bmenu-other-window)
(bookmark-bmenu-other-window-with-mouse): Remove unnecessary
bindings of bookmark-automatically-show-annotations (Bug#6515).

* bookmark.el (bookmark-maybe-load-default-file): Remove redundant
calls to expand-file-name.
(bookmark-relocate): Use abbreviated file names in bookmarks.
(bookmark-load): Use abbreviated file names in messages.

(bookmark-default-handler): Accept new bookmark field `buffer'.

  (bookmark-bmenu-marks-width): Bump back to 2, to include annotation marks.
  (bookmark-bmenu-hide-filenames): Adjust for above, and put the text
    property on the bookmark name, instead of not putting it at all.
  (bookmark-bmenu-list): Fix where we put the text property.

  for showing buffer modified state (as added in the previous change).

  (bookmark-bmenu-list): Initialize buffer-modified-p properly.
  (bookmark-send-edited-annotation): Mark bookmark-alist as modified.
  (with-buffer-modified-unmodified): New macro.
  (bookmark-bmenu-show-filenames, bookmark-bmenu-hide-filenames,
  bookmark-bmenu-mark, bookmark-bmenu-unmark, bookmark-bmenu-delete):
  Use new macro to preserve the buffer-modified state.

  (bookmark-bmenu-2-window, bookmark-bmenu-this-window)
  (bookmark-bmenu-other-window, bookmark-bmenu-switch-other-window)
  (bookmark-bmenu-show-annotation, bookmark-bmenu-edit-annotation)
  (bookmark-bmenu-rename, bookmark-bmenu-locate)
  (bookmark-bmenu-relocate, bookmark-bmenu-goto-bookmark): Remove
  unnecessary calls to `bookmark-bmenu-ensure-position'.

  (bookmark-bmenu-save): Clear buffer modification if no marks.

  (bookmark-bmenu-list, bookmark-bmenu-bookmark): Calculate property
  positions by using `bookmark-bmenu-marks-width', instead of hardcoding.
  This fixes the `bookmark-bmenu-execute-deletions' bug reported here:

  http://lists.gnu.org/archive/html/emacs-devel/2009-12/msg00819.html
  From: Sun Yijiang <sunyijiang {_AT_} gmail.com>
  To: emacs-devel {_AT_} gnu.org
  Subject: bookmark.el bug report
  Date: Mon, 28 Dec 2009 14:19:16 +0800
  Message-ID: 5065e2900912272219y3734fc9fsdaee41167ef99ad7@mail.gmail.com

  (bookmark-bmenu-ensure-position): New name for
  `bookmark-bmenu-check-position'.  Just ensure the position;
  don't return any meaningful value.
  (bookmark-bmenu-header-height, bookmark-bmenu-marks-width): New constants.

bookmark-bmenu-bookmark-column.

(bookmark-bmenu-list): Save name on `bookmark-name-prop' text-prop.
(bookmark-bmenu-show-filenames): Use push.
(bookmark-bmenu-hide-filenames): Use local var instead of
bookmark-bmenu-bookmark-column.  Use pop.  Don't save window-excursion.
(bookmark-bmenu-bookmark): Use the new `bookmark-name-prop' text-prop.
(bookmark-bmenu-execute-deletions): Don't bother adding/removing the
filenames now that the bookmark names are always available.

(bookmark-search-pattern): Move and leave unbound.
(bookmark-bmenu-mode-map): Change binding.
(bookmark-read-search-input): Simplify.
Don't use text-char-description.  Don't error on non-char events.
(bookmark-filtered-alist-by-regexp-only): Remove by folding into the
only caller (i.e. bookmark-bmenu-filter-alist-by-regexp).
(bookmark-bmenu-search): Don't check we're in a bookmark-list buffer.
Use a local var for the timer.
(bookmark-bmenu-cancel-search): Remove by folding into the only caller
(i.e. bookmark-bmenu-search).

  (bookmark-search-delay): Shorten doc string to fit in 80 columns.
  (bookmark-bmenu-search): Wrap to fit within 80 columns.  Minor
    grammar and punctuation fixes in doc string.
  (bookmark-read-search-input): Adjust to fit within 80 columns.

(bookmark-search-pattern, bookmark-search-timer, bookmark-quit-flag): New vars.
(bookmark-read-search-input, bookmark-filtered-alist-by-regexp-only)
(bookmark-bmenu-filter-alist-by-regexp)
(bookmark-bmenu-goto-bookmark, bookmark-bmenu-cancel-search): New funs.
(bookmark-bmenu-search): New command.
(bookmark-bmenu-mode-map): Bind it.

bookmark-sort-flag is non-nil (Bug#4653).

(bookmark-bmenu-show-filenames, bookmark-bmenu-hide-filenames):
Don't consider whether the display supports colors.
(bookmark-import-new-list): Use dolist.
(bookmark-bmenu-mode-map): Move initialization into declaration.
(bookmark-bmenu-list): Use dolist, simplify.
(bookmark-show-all-annotations): Use save-selected-window and dolist.
(menu-bar-final-items): Use push.

we're inside a dedicated or minibuffer window.

  of `bookmark-alist' and of the bookmark file format.
  Patch by Drew Adams, with minor tweaks from me.  (Bug#4195)

* eval.c (Fautoload): Purecopy the filename.  Simplify.

* category.c (Fdefine_category): Purecopy docstring.

* international/mule-cmds.el (set-language-info-alist): Purecopy lang-env.
(leim-list-header, leim-list-entry-regexp): Change defvars to defconst.
(charset): Purecopy the name.
(define-char-code-property): Purecopy string arguments.

* emacs-lisp/byte-run.el (make-obsolete, make-obsolete-variable):
Purecopy string arguments.

* emacs-lisp/lisp-mode.el (emacs-lisp-mode-map):
* ediff-hook.el (menu-bar-ediff-menu):
* buff-menu.el (Buffer-menu-mode-map): Purecopy names and tooltips.
* bookmark.el (menu-bar-bookmark-map): Add :help and purecopy the name.

  (bookmark-yank-word, bookmark-insert-current-bookmark): Update
  documentation to refer to variables documented in r1.135.

  (Info-suffix-list): Remove this completely unused variable.
  (bookmark-current-point): Remove this obsolete variable.
  (bookmark-set, bookmark-rename, bookmark-send-edited-annotation):
  Adjust for removal of bookmark-current-point.

  (bookmarks-already-loaded, bookmark-current-buffer, bookmark-yank-point):
  Document.  (Bug#4188)

  since the list will have been rebuilt anyway.  (Bug#4349)

  (bookmark-bmenu-execute-deletions): Don't save here, as bookmark-delete
  will now do so if necessary.

Suggested by: Thierry Volpiatto <thierry.volpiatto {_AT_} gmail.com>
(Bug#4348)

  (bookmark-jump-other-window): Just invoke bookmark-jump with new
  argument now, so the two function's behaviors will match.  (Bug#3645)

    don't do anything related to relocating, just return nil.
  (bookmark-error-no-filename): New error.
  (bookmark-default-handler): Signal `bookmark-error-no-filename' if
    bookmark has no file.  Don't even attempt to handle things that
    are not files; the whole point of custom handlers is to keep that
    knowledge elsewhere anyway.  Tighten some comments.
  (bookmark-file-or-variation-thereof): Remove now-unused function.
  (bookmark-location): Doc string fix.

(Bug#4250)

  don't use a file dialog, because they usually don't know how to read
  a directory target from the user.  (Bug#4230)
  Also, make sure the prompt can display directories as well as files.

  (Bug#1193)

  (bookmark-get-bookmark, bookmark-get-bookmark-record,
   bookmark-set-name, bookmark-prop-get, bookmark-prop-set,
   bookmark-get-annotation, bookmark-set-annotation, bookmark-get-filename,
   bookmark-set-filename, bookmark-get-position, bookmark-set-position,
   bookmark-get-front-context-string, bookmark-set-front-context-string,
   bookmark-get-rear-context-string, bookmark-set-rear-context-string,
   bookmark-location, bookmark-jump, bookmark-jump-other-window,
   bookmark-handle-bookmark, bookmark-relocate, bookmark-insert-location,
   bookmark-rename, bookmark-insert, bookmark-delete, bookmark-time-to-save-p,
   bookmark-edit-annotation-mode, bookmark-edit-annotation): Improve doc
   strings to say whether bookmark can be a string or a record or both,
   and make other consistency and clarity fixes.
  (bookmark-get-handler, bookmark--jump-via, bookmark-write-file,
   bookmark-default-annotation-text, bookmark-yank-word,
   bookmark-maybe-load-default-file, bookmark-maybe-sort-alist,
   bookmark-import-new-list, bookmark-maybe-rename,
   bookmark-bmenu-show-filenames, bookmark-bmenu-hide-filenames,
   bookmark-bmenu-bookmark): Give these doc strings.
  (bookmark-bmenu-check-position): Give this a doc string, but also
   add a FIXME comment about how the function may be pointless.
  (bookmark-default-handler): Rework doc string and change a parameter
   name, to clarify that this takes a bookmark record not a bookmark name.
  (bookmark-set): Change a parameter name to indicate its meaning,
   and improve the doc string a bit.
(Bug#4188)

(bookmark-make-record-function): Adjust documentation for above.
(Bug#4193)

list, to workaround performance problem (bug#4485).

* allout.el:
* apropos.el:
* arc-mode.el:
* autoinsert.el:
* avoid.el:
* battery.el:
* bookmark.el:
* buff-menu.el:
* calculator.el:
* chistory.el:
* cmuscheme.el:
* comint.el:
* compare-w.el:
* dabbrev.el:
* delim-col.el:
* desktop.el:
* diff-mode.el:
* diff.el:
* dired-aux.el:
* dired-x.el:
* dired.el:
* dos-vars.el:
* ediff-diff.el:
* ediff-help.el:
* ediff-init.el:
* ediff-merg.el:
* ediff-mult.el:
* ediff-ptch.el:
* ediff-vers.el:
* ediff-wind.el:
* ediff.el:
* emerge.el:
* facemenu.el:
* faces.el:
* ffap.el:
* filecache.el:
* find-dired.el:
* font-core.el:
* font-lock.el:
* forms.el:
* fringe.el:
* help-at-pt.el:
* hippie-exp.el:
* ido.el:
* image-file.el:
* imenu.el:
* indent.el:
* info.el:
* isearchb.el:
* iswitchb.el:
* jit-lock.el:
* jka-compr.el:
* log-edit.el:
* lpr.el:
* ls-lisp.el:
* man.el:
* menu-bar.el:
* midnight.el:
* mouse-sel.el:
* mouse.el:
* msb.el:
* outline.el:
* paren.el:
* pcmpl-cvs.el:
* pcmpl-gnu.el:
* pcomplete.el:
* pcvs-info.el:
* pcvs-parse.el:
* printing.el:
* ps-mule.el:
* ps-print.el:
* replace.el:
* ruler-mode.el:
* saveplace.el:
* sb-image.el:
* scroll-bar.el:
* sha1.el:
* shadowfile.el:
* shell.el:
* sort.el:
* speedbar.el:
* strokes.el:
* tempo.el:
* term.el:
* terminal.el:
* time-stamp.el:
* time.el:
* tree-widget.el:
* type-break.el:
* vc-cvs.el:
* vc-hg.el:
* vc-mcvs.el:
* vc-rcs.el:
* vc-sccs.el:
* vc.el:
* view.el:
* w32-vars.el:
* whitespace.el:
* wid-edit.el: Remove leading * from docstrings of defcustoms,
deffaces, defconsts and defuns.