emacs/lisp, branch scratch/xref-next Emacs is the extensible, customizable, self-documenting real-time display editor. Handle multiple matches on the same line; add highlighting 2015-11-10T11:32:10+00:00 Dmitry Gutov 2015-11-09T03:24:23+00:00 61dbe7654eeb732bf7b3128554f86bbba69245f9 






Replace xref-match-bounds with xref-match-length
2015-11-10T11:32:10+00:00

Dmitry Gutov

2015-11-08T03:01:05+00:00

eddace3c0ec5c7eb412494e0dc9cc5b3dc415617












; project-library-roots-function: Update the FIXME
2015-11-10T11:31:20+00:00

Dmitry Gutov

2015-11-10T02:39:32+00:00

cbc51211f9e4f8f3d4b8a1feaa6cbfd2fd4ac1ca












Fix some recently-perturbed bookmark autoloads
2015-11-10T04:14:54+00:00

Karl Fogel

2015-11-10T04:14:49+00:00

0f50e5163cf747fcf18124039a82b5156a48316b

* lisp/bookmark.el (bookmark-set-internal): Remove unnecessary autoload.
  (bookmark-set): Restore autoload.
  (bookmark-set-no-overwrite): Add autoload.

Thanks to Juanma Barranquero for noticing the autoload problems
introduced by my recent commit adding/changing the above functions
(Sun Nov 8 14:16:43 2015 -0500, git commit 3812e17978).





* lisp/bookmark.el (bookmark-set-internal): Remove unnecessary autoload.
  (bookmark-set): Restore autoload.
  (bookmark-set-no-overwrite): Add autoload.

Thanks to Juanma Barranquero for noticing the autoload problems
introduced by my recent commit adding/changing the above functions
(Sun Nov 8 14:16:43 2015 -0500, git commit 3812e17978).







* lisp/progmodes/project.el: Update Commentary.
2015-11-10T00:56:55+00:00

Dmitry Gutov

2015-11-10T00:56:55+00:00

82d59f1b3ba6d7ad9d9cd0af15e237f97bb5906b












Merge branch 'project-next'
2015-11-10T00:47:46+00:00

Dmitry Gutov

2015-11-10T00:47:46+00:00

0be6fb8e17f708fe03430d0b1e701810ae51b5e3












Fold `project-ask-user' into `project-current'
2015-11-10T00:41:06+00:00

Dmitry Gutov

2015-11-10T00:41:06+00:00

1c72afb7aa48c2ea06103113ef70ccea0c1c961d

* lisp/progmodes/project.el (project-find-functions): Remove
`project-ask-user'.
(project-ask-user): Remove function and the corresponding
`project-roots' implementation.
(project-current): Add a new argument, MAYBE-PROMPT.  Prompt the
user in case there's no project in the current directory.  Update
all callers.





* lisp/progmodes/project.el (project-find-functions): Remove
`project-ask-user'.
(project-ask-user): Remove function and the corresponding
`project-roots' implementation.
(project-current): Add a new argument, MAYBE-PROMPT.  Prompt the
user in case there's no project in the current directory.  Update
all callers.







When VC detects a conflict, specify which file
2015-11-09T21:57:29+00:00

Karl Fogel

2015-11-09T21:57:23+00:00

3c3aad733522365a8fe729d7c92e64e98bc4ce92

* lisp/vc/vc.el (vc-message-unresolved-conflicts): New function.
* lisp/vc/vc-svn.el (vc-svn-find-file-hook):
* lisp/vc/vc-hg.el (vc-hg-find-file-hook):
* lisp/vc/vc-bzr.el (vc-bzr-find-file-hook):
* lisp/vc/vc-git.el (vc-git-find-file-hook): Use above new function
  to display a standard message that specifies the conflicted file.

Before this change, the message VC used for indicating a conflicted
file was just "There are unresolved conflicts in this file" without
naming the file (and this language was duplicated in several places).
After this change, it's "There are unresolved conflicts in file FOO"
(and this language is now centralized in one function in vc.el).

Justification: It's important for the message to name the conflicted
file because the moment when VC realizes a file is conflicted does not
always come interactively.  For example, some people automatically
find a set of Org Mode files on startup, and may keep those .org files
under version control.  If any of the files are conflicted, the user
just sees some messages fly by, and might later check the "*Messages*"
buffer to find out what files were conflicted.  I'm not saying this
happened to me or anything; it's a purely hypothetical example.





* lisp/vc/vc.el (vc-message-unresolved-conflicts): New function.
* lisp/vc/vc-svn.el (vc-svn-find-file-hook):
* lisp/vc/vc-hg.el (vc-hg-find-file-hook):
* lisp/vc/vc-bzr.el (vc-bzr-find-file-hook):
* lisp/vc/vc-git.el (vc-git-find-file-hook): Use above new function
  to display a standard message that specifies the conflicted file.

Before this change, the message VC used for indicating a conflicted
file was just "There are unresolved conflicts in this file" without
naming the file (and this language was duplicated in several places).
After this change, it's "There are unresolved conflicts in file FOO"
(and this language is now centralized in one function in vc.el).

Justification: It's important for the message to name the conflicted
file because the moment when VC realizes a file is conflicted does not
always come interactively.  For example, some people automatically
find a set of Org Mode files on startup, and may keep those .org files
under version control.  If any of the files are conflicted, the user
just sees some messages fly by, and might later check the "*Messages*"
buffer to find out what files were conflicted.  I'm not saying this
happened to me or anything; it's a purely hypothetical example.







Make sure that the ignore file exists
2015-11-09T02:32:36+00:00

Dmitry Gutov

2015-11-09T02:32:36+00:00

e4c190b28d658d92f8c19799b19f8263650687e0

* lisp/vc/vc.el (vc-default-ignore-completion-table):
Make sure that the ignore file exists.





* lisp/vc/vc.el (vc-default-ignore-completion-table):
Make sure that the ignore file exists.







* gnus-sum.el (gnus-summary-backend-map): Bind B-backspace to
2015-11-09T01:59:24+00:00

Michael Sperber

2015-11-09T01:59:24+00:00

bcca6a2a028d05af3cb5b31a5a2c997f3f1f1d31

`gnus-summary-delete-article` in a way that also works on XEmacs.





`gnus-summary-delete-article` in a way that also works on XEmacs.