mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-21 21:20:44 -08:00
Code Issues Projects Releases Wiki Activity
112149 commits 241 branches 194 tags 7.7 GiB
Commit graph

353 commits

Author SHA1 Message Date
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
Glenn Morris
daee954c00 Don't bother making files writable for commit with modern VCS 
* lisp/vc/vc.el (vc-next-action):
Only gripe about committing read-only files for RCS and SCCS.

Fixes: debbugs:9781
 2012-09-26 23:59:21 -07:00
Chong Yidong
59f7af816e Use declare forms, where possible, to mark obsolete functions. 
* lisp/allout.el (allout-passphrase-hint-string): Likewise.
(allout-init): Use a declare form to mark obsolete.

* lisp/calendar/calendar.el (calendar-version):
* lisp/calendar/icalendar.el (icalendar-extract-ical-from-buffer)
(icalendar-convert-diary-to-ical):
* lisp/cus-edit.el (custom-mode):
* lisp/ansi-color.el (ansi-color-unfontify-region):
* lisp/international/latin1-disp.el (latin1-char-displayable-p):
* lisp/progmodes/cwarn.el (turn-on-cwarn-mode):
* lisp/progmodes/which-func.el (which-func-update-1): Use
define-obsolete-function-alias.

* lisp/bookmark.el (bookmark-jump-noselect): Use a declare form to mark
this function obsolete.

* lisp/calendar/cal-x.el (calendar-two-frame-setup)
(calendar-only-one-frame-setup, calendar-one-frame-setup):
* lisp/calendar/calendar.el (american-calendar, european-calendar)
(calendar-for-loop):
* lisp/comint.el (comint-dynamic-simple-complete)
(comint-dynamic-complete-as-filename, comint-unquote-filename):
* lisp/desktop.el (desktop-load-default):
* lisp/dired-x.el (dired-omit-here-always)
(dired-hack-local-variables, dired-default-directory):
* lisp/emacs-lisp/derived.el (derived-mode-class):
* lisp/emacs-lisp/timer.el (timer-set-time-with-usecs):
* lisp/emacs-lock.el (toggle-emacs-lock):
* lisp/epa.el (epa-display-verify-result):
* lisp/epg.el (epg-sign-keys, epg-start-sign-keys)
(epg-passphrase-callback-function):
* lisp/eshell/esh-util.el (eshell-for):
* lisp/eshell/eshell.el (eshell-remove-from-window-buffer-names)
(eshell-add-to-window-buffer-names):
* lisp/files.el (locate-file-completion):
* lisp/imenu.el (imenu-example--create-c-index)
(imenu-example--create-lisp-index)
(imenu-example--lisp-extract-index-name)
(imenu-example--name-and-position):
* lisp/international/mule-cmds.el (princ-list):
* lisp/international/mule-diag.el (decode-codepage-char):
* lisp/international/mule-util.el (detect-coding-with-priority):
* lisp/iswitchb.el (iswitchb-read-buffer):
* lisp/mail/mailalias.el (mail-complete):
* lisp/mail/sendmail.el (mail-sent-via):
* lisp/mouse.el (mouse-popup-menubar-stuff, mouse-popup-menubar)
(mouse-major-mode-menu):
* lisp/password-cache.el (password-read-and-add):
* lisp/pcomplete.el (pcomplete-parse-comint-arguments):
* lisp/progmodes/sh-script.el (sh-maybe-here-document):
* lisp/replace.el (query-replace-regexp-eval):
* lisp/savehist.el (savehist-load):
* lisp/simple.el (choose-completion-delete-max-match):
* lisp/term.el (term-dynamic-simple-complete):
* lisp/vc/ediff-init.el (ediff-check-version):
* lisp/vc/ediff-wind.el (ediff-choose-window-setup-function-automatically):
* lisp/vc/vc.el (vc-diff-switches-list):
* lisp/view.el (view-return-to-alist-update): Likewise.

* lisp/iswitchb.el (iswitchb-read-buffer): Move code of
iswitchb-define-mode-map here, and delete that obsolete function.

* lisp/subr.el (eval-next-after-load, makehash, insert-string)
(assoc-ignore-representation, assoc-ignore-case): Use declare to
mark obsolete.
(mode-line-inverse-video): Variable deleted.

* lisp/emacs-lisp/byte-run.el (make-obsolete): Doc fix; emphasize that
this applies to functions.

* lisp/erc/erc.el (erc-send-command): Use define-obsolete-function-alias.

* lisp/international/mule-util.el (string-to-sequence): Remove.

* lisp/net/newst-backend.el (newsticker-cache-filename):
* lisp/net/newst-treeview.el (newsticker-groups-filename): Fix
incorrect obsolescence declaration.

* lisp/net/snmp-mode.el (snmp-font-lock-keywords-3): Don't use obsolete
font-lock-reference-face.

* lisp/url/url-parse.el (url-recreate-url-attributes):
* lisp/url/url-util.el (url-generate-unique-filename): Use declare to mark
obsolete.

* src/xdisp.c (mode_line_inverse_video): Delete obsolete variable.
 2012-09-25 12:13:02 +08:00
Chong Yidong
0c765e5f57 Fix two references to deleted obsolete variables. 
Also, fix the copyright header for lisp/emacs-lisp/gv.el.

* lisp/vc/log-edit.el (log-edit-require-final-newline)
(log-edit-changelog-full-paragraphs): Default to t.
 2012-09-24 20:31:24 +08:00
Chong Yidong
a5f2b6ec3b Remove several obsolete vars and functions unlikely to be still in use. 
* lisp/vc/log-edit.el (cvs-changelog-full-paragraphs)
(cvs-commit-buffer-require-final-newline): Obsolete variables
removed.

* lisp/font-lock.el (font-lock-reference-face): Use
define-obsolete-variable-alias.

* lisp/international/mule.el (set-char-table-default): Remove.
(set-coding-priority, make-coding-system, generic-char-p)
(charset-list, charset-bytes, charset-id): Use declare to mark
obsolete.

* lisp/mail/supercite.el (sc-version): Remove obsolete function.
(sc-describe): Don't mark as obsolete, since it is bound.
(sc-submit-bug-report): Remove.

* lisp/progmodes/compile.el (compile-internal): Remove obsolete
function.
(compilation-parse-errors-function): Fix typo.

* lisp/vc/emerge.el (emerge-mode): Make it an obsolete alias.
(emerge-version): Remove.

* lisp/vc/pcvs-defs.el (cvs-buffer-name-alist)
(cvs-invert-ignore-marks): Remove references to obsolete vars.
* lisp/vc/vc-hooks.el (vc-default-registered): Don't use
vc-master-templates.

* lisp/vc/pcvs-defs.el (cvs-diff-buffer-name, cvs-diff-ignore-marks)
* lisp/vc/vc-hooks.el (vc-ignore-vc-files, vc-master-templates)
* lisp/vc/vc.el (vc-checkout-carefully): Likewise.

* src/chartab.c (Fset_char_table_default): Obsolete function removed.
 2012-09-24 20:23:25 +08:00
Chong Yidong
9f7c28f0f6 * vc/diff.el (diff-latest-backup-file): Autoload. 2012-09-20 12:29:04 +08:00
Chong Yidong
865fe16fd2 Update docstrings and comments to use "init file" terminology. 
* bookmark.el (bookmark-bmenu-toggle-filenames): Doc fixes.
* comint.el (comint-prompt-read-only):
* custom.el (defcustom):
* hi-lock.el (hi-lock-mode):
* ibuffer.el (ibuffer-formats):
* ielm.el (ielm-prompt-read-only):
* novice.el (disable-command):
* saveplace.el (toggle-save-place):
* speedbar.el (speedbar-supported-extension-expressions):
* startup.el (auto-save-list-file-prefix, init-file-user)
(after-init-hook, inhibit-startup-echo-area-message):
* strokes.el (strokes-help):
* time-stamp.el (time-stamp):
* calendar/calendar.el (calendar, diary-file):
* calendar/diary-lib.el (diary-mail-entries, diary)
(diary-list-entries-hook):
* calendar/holidays.el (holidays, calendar-holidays):
* calendar/lunar.el (lunar-phases):
* calendar/solar.el (sunrise-sunset):
* emulation/edt.el (edt-load-keys):
* emulation/viper.el (viper-mode):
* eshell/em-alias.el (eshell-command-aliases-list):
* eshell/esh-util.el (eshell-convert-numeric-arguments):
* international/ogonek.el (ogonek-information):
* net/tramp-cmds.el (tramp-bug):
* net/quickurl.el (quickurl-reread-hook-postfix):
* play/decipher.el (decipher-font-lock-keywords):
* progmodes/cc-styles.el (c-set-style):
* progmodes/idlw-shell.el (idlwave-shell-prompt-pattern):
* progmodes/inf-lisp.el (inferior-lisp-prompt):
* progmodes/octave-mod.el (octave-mode):
* progmodes/sql.el (sql-mode, sql-interactive-mode, sql-password):
* progmodes/verilog-mode.el (verilog-read-defines):
* textmodes/two-column.el (2C-mode): Likewise.
 2012-09-17 13:41:04 +08:00
Glenn Morris
823751606a Improve vc-bzr-working-revision for lightweight checkouts 
* lisp/vc/vc-bzr.el (vc-bzr-working-revision): For lightweight local
checkouts, check the parent dirstate matches the branch.
Add "--tree" to "bzr revno" arguments.  Don't try to shorten the
empty string.
 2012-09-14 21:11:52 -04:00
Glenn Morris
b9800ec43b * lisp/vc/vc.el: No need to require ediff. 
(ediff-load-version-control): Declare.
(ediff-vc-internal): Fix declaration.
(vc-version-ediff): Require ediff.
 2012-09-13 14:23:33 -04:00
Dan Nicolaescu
0780c51704 * vc/diff-mode.el (diff-mode-menu): diff-remove-trailing-whitespace. 2012-09-10 10:40:13 -04:00