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).

 arc-mode.el (archive-zip-extract): Don't quote the file name on
 MS-Windows and MS-DOS.  (Bug#6467, Bug#6144)

* lisp/comint.el (make-comint, make-comint-in-buffer): Mention return
value in the docstrings.  (Bug#6498)

* lisp/bs.el (bs-mode-font-lock-keywords): Remove "by" from Dired
pattern, since it is not present when using some non-default switches.

* lisp/simple.el (compose-mail): Fix doc string to refer to
`compose-mail-user-agent-warnings', instead of to the nonexistent
`compose-mail-check-user-agent'.

* lisp/vc-git.el (vc-git-find-revision): Deal with empty results from
ls-files.  Doe not pass the object as a file name to cat-file, it
is not a file name.
(vc-git-annotate-command): Pass the file name using -- to avoid
ambiguity with the revision.
(vc-git-previous-revision): Pass a relative file name.

* lisp/progmodes/js.el (js-mode-map): Use standard capitalization and
ellipses for menu entries.

* lisp/vc-annotate.el (vc-annotate): Add an optional argument for the
VC backend.  Use it when non-nil.
(vc-annotate-warp-revision): Pass the VC backend to vc-annotate.  (Bug#6487)

* lisp/vc-annotate.el (vc-annotate-show-diff-revision-at-line-internal):
Do not pass the file name to the 'previous-revision call when we
don't want a file diff.  (Bug#6489)

* lisp/vc.el (vc-find-revision): Add an optional argument for
the VC backend.  Use it when non-nil.
* lisp/vc-annotate.el (vc-annotate-find-revision-at-line): Pass the VC
backend to vc-find-revision.  (Bug#6487)

* lisp/vc-git.el (vc-git-annotate-extract-revision-at-line): Remove
trailing whitespace.  Suggested by Eric Hanchrow.  (Bug#6481)

local variables, set it first.

* lisp/descr-text.el (describe-char-unicode-data): Insert separating
space when needed.

* lisp/progmodes/idlwave.el (idlwave-action-and-binding):
Fix typo in 2009-12-03 change.

Fixes: debbugs:6290

font-lock-mode-major-mode to distinguish it from
global-font-lock-mode's own font-lock-mode-major-mode.
(font-lock-set-defaults):
* lisp/font-core.el (font-lock-default-function): Adjust users.
(font-lock-mode): Don't set it at all.

Fixes: debbugs:6135

* lisp/calendar/appt.el (appt-time-msg-list): Doc fix.
(appt-check): Let-bind appt-warn-time.
(appt-add): Make the 3rd argument optional.
Simplify argument names.  Doc fix.  Check for integer WARNTIME.
Only add WARNTIME to the output list if non-nil.

* lisp/calendar/appt.el (appt-check): Let the 3rd element of
appt-time-msg-list specify the warning time.
(appt-add): Add new argument with the warning time.

* lisp/vc-svn.el (vc-svn-after-dir-status): Fix regexp for Subversions
older than version 1.6.

* lisp/emacs-lisp/cl-macs.el (destructuring-bind): Bind `bind-enquote',
used by cl-do-arglist.

Define warning-suppress-types before we let-bind it.

Fixes: debbugs:6275

declare it, make it buffer-local, and permanent-local.
(vc-resynch-window): Adjust name.
* lisp/vc-hooks.el (vc-find-file-hook): Adjust name.

Fixes: debbugs:6324

(rcirc-server-alist): Add :password keyword.
(rcirc): Ask for a password, or get it from the server's alist.
(rcirc-connect): Add password argument.  Pass it to server.

* cedet/semantic/lex-spp.el
(semantic-lex-spp-table-write-slot-value): Instead of erroring on
invalid values during save, just save a nil (Bug#6324).

* lisp/desktop.el (desktop-clear-preserve-buffers): Add "*Warnings*" buffer.

Backport from trunk.

`file-directory-p' to the filename part rather than to the whole text.

Fixes: debbugs:6231

Fixes: debbugs:6319

* lisp/subr.el (momentary-string-display): Just use read-event to read
the exit event (Bug#6238).

(ansi-color-drop-regexp): New constant.
(ansi-color-apply, ansi-color-filter-region)
(ansi-color-apply-on-region): Delete unrecognized control sequences.
(ansi-color-apply): Build string list before calling concat.

font-lock-constant-face, not obsolete font-lock-reference-face.

* htmlfontify.el (hfy-face-resolve-face): New function.
(hfy-face-to-style): Use it (Bug#6279).