masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-16 08:50:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
109774 commits 2 branches 0 tags 515 MiB
Commit graph

312 commits

Author SHA1 Message Date
Stefan Monnier
a07846093f * lisp/vc/vc-bzr.el (vc-bzr--sanitize-header): New function. 
(vc-bzr-checkin): Use it.
* lisp/vc/log-edit.el (log-edit-extract-headers): Don't presume FUNCTION
will preserve match-data.

Fixes: debbugs:13307
 2013-01-11 22:15:14 -05:00
Aaron S. Hawley
9fc9a531a5 Disambiguate function and variable references in docstrings. 
* lisp/comint.el (comint-history-isearch-message): Fix ambiguous doc
 string cross-reference(s).

* lisp/ffap.el (ffap-string-at-point-region, ffap-next)
(ffap-string-at-point, ffap-string-around)
(ffap-copy-string-as-kill, ffap-highlight-overlay)
(ffap-literally): Fix ambiguous doc string cross-reference(s).

* lisp/font-lock.el (font-lock-keywords-alist)
(font-lock-removed-keywords-alist): Fix ambiguous doc string
        cross-reference(s).

* lisp/help-mode.el (help-xref-symbol-regexp): Add "call" as a hint for
a cross-reference to a function.

* lisp/info.el (Info-find-emacs-command-nodes): Fix ambiguous doc
 string cross-reference(s).

* lisp/isearch.el (isearch-message-function, isearch-fail-pos): Fix
 ambiguous doc string cross-reference(s).

* lisp/misearch.el (multi-isearch-next-buffer-function): Fix ambiguous
 doc string cross-reference(s).

* lisp/newcomment.el (comment-box): Fix ambiguous doc string
 cross-reference(s).

* lisp/printing.el (pr-txt-printer-alist, pr-ps-printer-alist)
(pr-setting-database): Fix ambiguous doc string
 cross-reference(s).

* lisp/ps-print.el (ps-even-or-odd-pages, ps-spool-buffer-with-faces)
(ps-n-up-filling-database): Fix ambiguous doc string
 cross-reference(s).

* lisp/server.el (server-buffer, server-log): Fix ambiguous doc string
 cross-reference(s).

* lisp/simple.el (newline, delete-backward-char, delete-forward-char)
(minibuffer-history-isearch-message, kill-line, track-eol)
(temporary-goal-column): Fix ambiguous doc string
 cross-reference(s).

* lisp/whitespace.el (whitespace-point)
(whitespace-font-lock-refontify, whitespace-bob-marker)
(whitespace-eob-marker): Fix ambiguous doc string
 cross-reference(s).

* lisp/calc/calc.el (calc-highlight-selections-with-faces)
 (calc-dispatch): Fix ambiguous doc string cross-reference(s).

* lisp/emacs-lisp/edebug.el (edebug-read, edebug-eval-defun): Fix
 ambiguous doc string cross-reference(s).

* lisp/gnus/gnus-start.el (gnus-check-new-newsgroups): Fix ambiguous doc string
 cross-reference(s).

* lisp/gnus/gnus-sum.el (gnus-summary-newsgroup-prefix): Fix ambiguous doc string
 cross-reference(s).

* lisp/international/mule.el (add-to-coding-system-list): Fix ambiguous
 doc string cross-reference(s).

* lisp/progmodes/cc-fonts.el (c-font-lock-keywords-3)
(c++-font-lock-keywords-3, objc-font-lock-keywords-3)
(java-font-lock-keywords-3, idl-font-lock-keywords-3)
(pike-font-lock-keywords-3): Fix ambiguous doc string
 cross-reference(s).

* lisp/progmodes/compile.el (compile): Fix ambiguous doc string
 cross-reference(s).

* lisp/progmodes/etags.el (tags-table-files)
(tags-table-files-function, tags-included-tables-function): Fix
 ambiguous doc string cross-reference(s).

* lisp/progmodes/gdb-mi.el (gdb, gdb-setup-windows)
(gdb-restore-windows): Fix ambiguous doc string
 cross-reference(s).

* lisp/textmodes/flyspell.el (flyspell-mark-duplications-flag)
(flyspell-default-deplacement-commands): Fix ambiguous doc string
 cross-reference(s).

* lisp/textmodes/ispell.el (ispell-accept-output): Fix ambiguous doc
 string cross-reference(s).

* lisp/textmodes/sgml-mode.el (html-tag-help): Fix ambiguous doc string
 cross-reference(s).

* lisp/vc/compare-w.el (compare-ignore-whitespace)
(compare-ignore-case, compare-windows-dehighlight): Fix ambiguous
 doc string cross-reference(s).

* lisp/vc/diff.el (diff): Fix ambiguous doc string cross-reference(s).

* src/insdel.c (Fcombine_after_change_execute, syms_of_insdel): Fix
 ambiguous doc string cross-reference(s).

* src/keyboard.c (Fcommand_execute, syms_of_keyboard): Fix ambiguous
 doc string cross-reference(s).

* src/window.c (Fwindow_point, syms_of_window): Fix ambiguous doc
 string cross-reference(s).

Fixes: debbugs:12686
 2013-01-11 18:08:55 -05:00
Stefan Monnier
1c851e98b6 * lisp/vc/pcvs.el (cvs-cleanup-collection): Extend meaning of `rm-handled'. 
(cvs-mode-remove-handled): Use it.

Fixes: debbugs:13380
 2013-01-08 12:34:35 -05:00
Chong Yidong
58ba7b1b55 Try to handle buffer/file modifications which conflict with VCS locking. 
* vc/vc-hooks.el (vc-after-save): DTRT for locking VCSes.

* vc/vc.el (vc-next-action): Detect buffer modifications
conflicting with locking VCS operation.

Fixes: debbugs:11490
 2013-01-06 10:58:57 +08:00
Paul Eggert
0877d0dc24 Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca 2013-01-02 08:13:04 -08:00
Paul Eggert
ab422c4d68 Update copyright notices for 2013. 2013-01-01 09:11:05 +00:00
Glenn Morris
b83a2ddd47 * lisp/vc/log-edit.el (log-edit-header-contents-regexp): Add doc string. 2012-12-31 12:13:28 -08:00
Dmitry Antipov
87523aedc8 * vc/ediff-ptch.el (ediff-map-patch-buffer): Use `point-min-marker'. 
Adjust comment.
 2012-12-20 09:05:41 +04:00
Stefan Monnier
f4d79bd021 * lisp/vc/diff-mode.el (diff-post-command-hook): Don't ignore changes at the 
very beginning of a hunk (e.g. killing the first line).
 2012-12-19 14:41:43 -05:00
Dave Abrahams
665e5e07a9 * lisp/vc/ediff-util.el (ediff-buffer-type): New function. 
(ediff-clone-buffer-for-current-diff-comparison): Compute the buf-type
rather than taking it as as argument.
(ediff-inferior-compare-regions): Adjust calls accordingly.

Fixes: debbugs:11319
 2012-12-14 10:22:24 -05:00
Glenn Morris
265c2fbf11 Merge from emacs-24; up to 2012-11-26T19:56:14Z!monnier@iro.umontreal.ca 2012-12-09 18:00:42 -08:00
Juanma Barranquero
bf741d337c lisp/vc/vc-hooks.el (vc-state): Doc fix. 2012-12-07 04:55:40 +01:00
Glenn Morris
49596095d0 Add conflict detection/resolution to vc-hg (bug#10709) 
* lisp/vc/vc-hg.el (vc-hg-resolve-when-done, vc-hg-find-file-hook):
New functions, for detecting and resolving conflicts.
 2012-12-04 20:49:31 -05:00
Chong Yidong
770de7cf72 Obsolete longlines.el. 
* longlines.el: Move to obsolete/.

* lisp/org/org-bibtex.el (org-bibtex-ask): Use visual-line-mode instead of
longlines-mode.

* lisp/vc/ediff-diff.el (ediff-extract-diffs, ediff-extract-diffs3):
Remove code referring to longlines mode.
 2012-12-04 10:47:43 +08:00
Dmitry Gutov
db47d5e975 * lisp/vc/vc.el (vc-delete-file, vc-rename-file): Default to the 
current buffer's file name when called interactively.

Fixes: debbugs:12488
 2012-12-03 01:12:31 +04:00
Yuya Nishihara
cb5d51dc07 Fix use of buffer-file-truename in vc-find-file-hook (tiny change). 
* lisp/vc/vc-hooks.el (vc-find-file-hook): Expand buffer-file-truename
before using it for comparison.

Fixes: debbugs:5297
 2012-12-01 21:25:13 +08:00
Chong Yidong
ba03d0d932 Modularize add-log-current-defun. 
Suggested by Jari Aalto.

* lisp/emacs-lisp/lisp-mode.el (lisp-current-defun-name): New.
(lisp-mode-variables): Use it.

* lisp/progmodes/cc-mode.el (c-common-init):
* lisp/progmodes/cperl-mode.el (cperl-mode): Set a value for
add-log-current-defun-function.

* lisp/progmodes/m4-mode.el (m4-current-defun-name): New function.
(m4-mode): Use it.

* lisp/progmodes/perl-mode.el (perl-current-defun-name): New.
(perl-mode): Use it.

* lisp/progmodes/scheme.el (scheme-mode-variables, dsssl-mode): Use
lisp-current-defun-name.

* lisp/textmodes/tex-mode.el (tex-current-defun-name): New.
(tex-common-initialization): Use it.

* lisp/textmodes/texinfo.el (texinfo-current-defun-name): New.
(texinfo-mode): Use it.

* lisp/vc/add-log.el (add-log-current-defun-function): Doc fix.
(add-log-current-defun): Move mode-specific code to other files.
(add-log-lisp-like-modes, add-log-c-like-modes)
(add-log-tex-like-modes): Variables deleted.

Fixes: debbugs:2224
 2012-12-01 12:57:07 +08:00
Kirk Kelsey
3ddbf80375 * vc-hg.el (vc-hg-next-revision): Ensure use of default "tip" output format 
Fixes: debbugs:6968
 2012-11-30 21:10:53 -05:00
Chong Yidong
a8b733a519 * vc/vc-git.el (vc-git-command): Disable the pager. 
Fixes: debbugs:6137
 2012-11-30 15:43:05 +08:00
OKAZAKI Tetsurou
171b09490b Relax existing-registration check in vc-register (tiny change). 
* vc/vc.el (vc-register): Allow registering a file which is already
registered with a different backend.

Fixes: debbugs:10589
 2012-11-30 12:44:52 +08:00
Glenn Morris
4ad900d993 Add desktop support for restoring vc-dir buffers (bug#10606) 
* lisp/vc/vc-dir.el (vc-dir-mode): Autoload it (for desktop restore).
Set buffer-local value of desktop-save-buffer.
(vc-dir-desktop-buffer-misc-data, vc-dir-restore-desktop-buffer):
New functions.
(desktop-buffer-mode-handlers): Add vc-dir-mode entry.

* lisp/desktop.el (desktop-save-buffer-p): Treat vc-dir like dired.
 2012-11-28 20:16:51 -05:00
Glenn Morris
5c9cf0a3f9 Merge from emacs-24; up to 2012-11-20T20:06:17Z!monnier@iro.umontreal.ca 2012-11-26 19:10:32 -08:00
Glenn Morris
999e745ef7 vc-hooks.el workaround for bug#11490 
* vc/vc-hooks.el (vc-mistrust-permissions): Default to t, to avoid data-loss.
 2012-11-26 18:50:12 -05:00
Stefan Monnier
1000d89524 * lisp/vc/diff-mode.el (diff-hunk): Don't make useless timers. 2012-11-19 13:40:18 -05:00
Glenn Morris
2ac9538d67 Merge from emacs-24; up to 2012-11-15T23:31:37Z!dancol@dancol.org 2012-11-17 17:52:36 -08:00
Chong Yidong
c2d075572c Fix for vc-svn-merge-news. 
* vc/vc-svn.el (vc-svn-merge-news): Properly parse the merge
response when the target file is in a subdirectory.

Fixes: debbugs:12757
 2012-11-17 15:06:57 +08:00
Glenn Morris
6baf66d53b Merge from emacs-24; up to 2012-11-08T14:54:03Z!monnier@iro.umontreal.ca 2012-11-10 15:13:33 -08:00
Chong Yidong
9d9e48d904 Rewrite and rename diff-delete-trailing-whitespace. 
* lisp/vc/diff-mode.el (diff-delete-trailing-whitespace): Rewrite, and
rename from diff-remove-trailing-whitespace (Bug#12831).

* files.texi (Diff Mode): Doc fixes for
diff-delete-trailing-whitespace.
 2012-11-09 01:31:53 +08:00
Glenn Morris
26f596760d Document diff-remove-trailing-whitespace 
* doc/emacs/files.texi (Diff Mode): Trailing whitespace updates.

* lisp/vc/diff-mode.el (diff-remove-trailing-whitespace): Doc fix.

* etc/NEWS: Related markup.
 2012-11-08 00:14:23 -08:00
Glenn Morris
9749e2b071 * lisp/vc/vc-svn.el (vc-svn-state-heuristic): Avoid calling svn. 
Fixes: debbugs:7850
 2012-11-03 21:13:13 -07:00
Stefan Monnier
d7f9cc8528 * lisp/vc/diff-mode.el (diff-context->unified): Don't get confused by "hunk 
header comments".
(diff-unified->context, diff-context->unified)
(diff-reverse-direction, diff-fixup-modifs): Use `use-region-p'.
 2012-10-29 11:14:10 -04:00
Chong Yidong
1dc2755a71 * vc/vc-hooks.el (vc-file-clearprops): Kill vc-parent-buffer. 
Suggested by Dan Nicolaescu.

Fixes: debbugs:6326
 2012-10-29 19:12:17 +08:00
Stefan Monnier
a2be03575f * lisp/vc/diff-mode.el (diff-end-of-hunk): Also skip potential "no LF at eol". 
(diff-refine-hunk): Similarly, handle the "no LF at eol".

Fixes: debbugs:12584
 2012-10-26 11:51:42 -04:00
Stefan Monnier
9c3e39f3ff * lisp/vc/diff-mode.el (diff-hunk): `save-excursion' while refining. 
Fixes: debbugs:12671
 2012-10-23 14:40:23 -04:00
Stefan Monnier
d106953274 Cleanup uses of "-hooks". 
* doc/emacs/custom.texi (Hooks):
* doc/lispref/hooks.texi (Standard Hooks): Clarify that -hooks is deprecated.

* lisp/gnus/nndiary.el (nndiary-request-create-group-functions)
(nndiary-request-update-info-functions)
(nndiary-request-accept-article-functions):
* lisp/gnus/gnus-start.el (gnus-subscribe-newsgroup-functions):
* lisp/cedet/semantic/db-file.el (semanticdb-save-database-functions):
* lisp/cedet/semantic/lex.el (semantic-lex-reset-functions):
* lisp/cedet/semantic/edit.el (semantic-change-functions)
(semantic-edits-new-change-functions)
(semantic-edits-delete-change-functions)
(semantic-edits-reparse-change-functions):
* lisp/htmlfontify.el (hfy-post-html-hook):
* lisp/filesets.el (filesets-cache-fill-content-hook):
* lisp/arc-mode.el (archive-extract-hook):
* lisp/progmodes/cc-mode.el (c-prepare-bug-report-hook):
* lisp/net/rcirc.el (rcirc-sentinel-functions)
(rcirc-receive-message-functions, rcirc-activity-functions)
(rcirc-print-functions):
* lisp/net/dbus.el (dbus-event-error-functions):
* lisp/emacs-lisp/eieio.el (eieio-pre-method-execution-functions):
* lisp/emacs-lisp/checkdoc.el (checkdoc-style-functions)
(checkdoc-comment-style-functions): Don't use "-hooks" suffix.

* lisp/term/sun.el (sun-raw-prefix-hooks):
* lisp/mail/sendmail.el (mail-yank-hooks):
* lisp/mh-e/mh-letter.el (mh-yank-hooks): Use make-obsolete-variable.
 2012-10-23 11:06:07 -04:00
Chong Yidong
4c5d08a868 Fix *vc-diff* buffer's behavior for empty diffs. 
* vc/vc.el (vc-diff-internal): Set up Diff mode even if there are
no changes to show.

Fixes: debbugs:12586
 2012-10-20 20:04:45 +08:00
Stefan Monnier
6be9197e60 * lisp/vc/diff-mode.el (diff--auto-refine-data): New var. 
(diff-hunk): Use it to delay refinement.
(diff-mode): Remove overlays when we turn off font-lock.
 2012-10-01 23:49:28 -04:00
Stefan Monnier
fe0a74f91a * lisp/vc/add-log.el (add-log-buffer-file-name-function): Demote to defvar 
and give a non-nil default value.
(add-change-log-entry): Simplify accordingly.
 2012-10-01 20:37:39 -04:00
Dmitry Gutov
9f7b98f812 Support git commit --amend/--signoff 
* lisp/vc/log-edit.el (log-edit-font-lock-keywords): Allow hyphens in
header names.
(log-edit-toggle-header): New function.
(log-edit-extract-headers): Accept function values in HEADERS alist.

* lisp/vc/vc-git.el (vc-git-log-edit-toggle-signoff): New function.
(vc-git-log-edit-toggle-amend): New function.
(vc-git-log-edit-toggle-signoff): New function.
(vc-git-log-edit-mode): New major mode.
(vc-git-log-edit-mode-map): Keymap for it.
(vc-git-checkin): Handle "Amend" and "Sign-Off" headers.
 2012-10-02 04:24:18 +04:00
Juri Linkov
d80d54b289 * lisp/facemenu.el (list-colors-sort): Add option "Luminance". 
(list-colors-sort-key): Implement it.

* lisp/vc/diff-mode.el (diff-refine-removed):
* lisp/vc/ediff-init.el (ediff-fine-diff-A):
* lisp/vc/smerge-mode.el (smerge-refined-removed):
Change background color "#ffaaaa" to "#ffbbbb".

Fixes: debbugs:10181
 2012-09-30 19:36:42 +03:00
Stefan Monnier
e01c13fea4 * lisp/vc/pcvs.el (cvs-cleanup-collection): Keep entries that are currently 
visited in a buffer.
(cvs-insert-visited-file): New function.
(find-file-hook): Use it.
* lisp/vc/pcvs-info.el (cvs-fileinfo-pp): Don't use non-existent faces.
 2012-09-29 23:44:35 -04:00
Stefan Monnier
02661b3a81 * lisp/vc/log-edit.el (log-edit-font-lock-keywords): Ignore case to 
chose face.
(log-edit-empty-buffer-p): Don't require a space after a header.
 2012-09-29 23:30:25 -04:00
Stefan Monnier
43711d4b01 * lisp/vc/ediff-util.el (ediff-diff-at-point): Don't assume point-min==1. 2012-09-29 23:28:38 -04:00
Glenn Morris
630d468c93 Comment fix 2012-09-29 19:27:36 -07:00
Glenn Morris
7bd302ebcb Remove duplication of vc-sccs-registered definition 
* lisp/vc/vc-sccs.el (vc-sccs-registered): Use the progn trick to get
the full definition in loaddefs, rather than duplicating it.
Cf vc-rcs-registered.
 2012-09-29 16:21:57 -07:00
Glenn Morris
a123c57a36 Comment for vc-rcs 2012-09-29 16:19:46 -07:00
Glenn Morris
91740b408c Comment for vc-sccs 2012-09-29 16:18:33 -07:00
Glenn Morris
93ab178b04 Comments for vc-bzr, clarifying vc-bzr-registered 2012-09-29 16:13:29 -07:00
Glenn Morris
d2a54f135f Revert bogus vc autoloads change 2012-09-29 12:19:17 -07:00
Glenn Morris
2923922f5e No need to autoload vc-rcs, vc-sccs defcustoms. 
* lisp/vc/vc-rcs.el (vc-rcs-master-templates):
* lisp/vc/vc-sccs.el (vc-sccs-master-templates): No need to autoload.
 2012-09-29 11:28:01 -07:00