1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 02:51:31 -08:00
Commit graph

695 commits

Author SHA1 Message Date
Tino Calancha
3f7493e27c ; Fix a typo in comment
* lisp/vc/ediff-wind.el (ediff-setup-windows-multiframe-merge):
Fix a typo in comment.
2017-02-10 20:05:11 +09:00
Tino Calancha
06695a02fd ; Fix a typo in ediff-merg.el
* lisp/vc/ediff-merg.el (ediff-skip-merge-regions-that-differ-from-default):
Fix a typo in docstring.
2017-01-21 00:31:40 +09:00
Paul Eggert
5badc81c1c Update copyright year to 2017
Run admin/update-copyright.
2016-12-31 19:42:26 -08:00
Philipp Stephani
229315c0e2 ; Add missing symbol quoting.
* lisp/vc/ediff-util.el (ediff-janitor): Add missing symbol quoting.
2016-12-18 22:27:42 +01:00
Glenn Morris
08decbd04b Doc fix for vc-git
* lisp/vc/vc-git.el (vc-git-region-history): Add a doc string.
2016-12-07 22:53:58 -08:00
Eli Zaretskii
ba2847f5a5 ; * lisp/vc/ediff-util.el (ediff-janitor): Fix last change. (Bug#25046) 2016-12-02 16:35:16 +02:00
Eli Zaretskii
8b43f97e2c * lisp/vc/ediff-util.el (ediff-janitor): Doc fix. (Bug#25046) 2016-12-02 11:29:10 +02:00
Paul Eggert
dc152c54f4 Modernize usage of 'macOS' in doc and comments
Apple changed the spelling of its operating system again, to "macOS",
effective with macOS 10.12 Sierra (2016-09-20).  Change Emacs
documentation and comments to match this.  Stick with older OS
spellings ("OS X", "Mac OS X") when talking about older releases where
the older names are more correct.
2016-11-06 00:42:03 -07:00
Hong Xu
23570fd995 Clarify documentation of 'vc-responsible-backend' wrt symlinks
* lisp/vc/vc.el (vc-responsible-backend): Clarify that symlinks
are not resolved when the VC backend is reported.

* doc/lispref/files.texi (Truenames): Document
'vc-responsible-backend'.  (Bug#23436)
* doc/emacs/maintaining.texi (Version Control Systems): Fix a
typo.
2016-11-04 12:06:00 +02:00
Tino Calancha
3877c911b7 vc-region-history: Search just on lines intersecting the region
* lisp/vc/vc.el (vc-region-history): If region ends in the beginning
of a line, then exclude that line from the search (Bug#24725).
2016-10-20 19:39:59 +09:00
Göktuğ Kayaalp
e535ca4522 Fix display of vc-dir CVS file statuses in subdirectories
* lisp/vc/vc-cvs.el (vc-cvs-dir-status-files): Use 'cvs update'
instead of 'cvs status'.  It's faster, easier to parse, and
relieves us of the need to use vc-expand-dirs.  (Bug#24082)
(vc-cvs-after-dir-status): Parse its output.
2016-10-18 03:03:17 +03:00
Dmitry Gutov
dc5e65b5de Unset GIT_DIR when calling Git commands
* lisp/vc/vc-git.el (vc-git--call, vc-git-command):
Unset GIT_DIR (bug#23769).
2016-06-22 02:04:33 +03:00
Dmitry Gutov
897fb6fa49 ; 'Changes from the pre-25.1 API' copyedits 2016-05-25 04:01:12 +03:00
Dmitry Gutov
825ca2542e Rename vc-stay-local back to vc-cvs-stay-local
* lisp/vc/vc-cvs.el (vc-cvs-stay-local): Rename back from
vc-stay-local (bug#19548).  Improve the docstring.
(vc-cvs-stay-local-p): Update accordingly.
2016-05-25 03:54:41 +03:00
Eli Zaretskii
ccdaf04cfd Fix the MSDOS build
* config.bat:
* msdos/sedlisp.inp:
* msdos/sedlibmk.inp:
* msdos/sedleim.inp:
* msdos/sedadmin.inp:
* msdos/sed6.inp:
* msdos/sed3v2.inp:
* msdos/sed2v2.inp:
* msdos/sed1v2.inp: Adapt to Emacs 25.

* src/process.c (remove_slash_colon): Move out of "#ifdef
subprocesses" block, as it its called unconditionally.  Move
ADD_SUBFEATURE calls into "#ifdef subprocesses" block, as they
reference variables only defined in that block.
* src/msdos.h: Provide prototypes for IT_set_frame_parameters,
faccessat, msdos_fatal_signal, syms_of_msdos, pthread_sigmask,
dos_keysns, dos_keyread, run_msdos_command, and
syms_of_win16select, to avoid compiler warnings.
* src/msdos.c (SYS_ENVIRON): Define to either '_environ' or
'environ', depending on the DJGPP version.
Remove declarations of externally-visible Lisp objects, like
Qbackground_color and Qreverse.
(run_msdos_command): First argument is not signed, not unsigned.
Use SYS_ENVIRON.
(sys_select): Use 'timespec_cmp' instead of 'timespec_sign', as
the latter doesn't work when 'time_t' is an unsigned data type.
This caused idle timers to behave incorrectly: they only fired
after a keyboard input event.
* src/frame.c (adjust_frame_size) [MSDOS]: Account for
FRAME_TOP_MARGIN that isn't counted in the frame's number of
lines, but dos_set_window_size needs it to be added.
* src/lread.c (INFINITY, NAN) [DJGPP < 2.05]: Provide definitions.
* src/fns.c (sort_vector_copy) [__GNUC__ < 4]: Provide a prototype
that works around compilation errors with older GCC versions.
* src/w16select.c: Don't declare QCLIPBOARD and QPRIMARY as Lisp
Objects.
* src/filelock.c [MSDOS]: Ifdef away most of the code.  Provide
no-op implementations for 'lock_file' and 'unlock_file'.
(Ffile_locked_p) [MSDOS]: Always return nil.  This avoids multiple
ifdefs in all users of filelock.c functionality.
* src/conf_post.h (EOVERFLOW, SIZE_MAX) [DJGPP < 2.04]: Define.
* src/emacs.c [MSDOS]: Include dosfns.h, to avoid compiler
warnings.
* src/dosfns.h: Provide prototypes for dos_cleanup,
syms_of_dosfns, and init_dosfns.
* src/deps.mk (atimer.o): Depend on msdos.h.
(emacs.o): Depend on dosfns.h.
* src/atimer.c [MSDOS]: Include msdos.h, to avoid compiler
warnings.

* lisp/window.el (window--adjust-process-windows): Skip the body
if 'process-list' is not available.  This avoids failure to start
up on MS-DOS.
* lisp/vc/diff.el (diff-no-select): Test 'make-process', not
'start-process', as the latter is now available on all platforms.
* lisp/textmodes/ispell.el (ispell-async-processp): Replace
'start-process' with 'make-process' in a comment.
* lisp/term/internal.el (IT-unicode-translations): Modify and add
a few translations to display Info files with Unicode markup.  Fix
an ancient off-by-one mismatch error with Unicode codepoints.
* lisp/progmodes/compile.el (compilation-start): Test
'make-process', not 'start-process', as the latter is now
available on all platforms.
* lisp/man.el (Man-build-man-command, Man-getpage-in-background):
Test 'make-process', not 'start-process', as the latter is now
available on all platforms.
* lisp/international/mule-cmds.el (set-coding-system-map): Test
'make-process', not 'start-process', as the latter is now
available on all platforms.
* lisp/eshell/esh-cmd.el (eshell-do-pipelines-synchronously): Doc
fix.
(eshell-execute-pipeline): Test 'make-process', not
'start-process', as the latter is now available on all platforms.
2016-04-30 13:45:33 +03:00
Leo Liu
71fb0e06e7 Improve last change to vc-git-mode-line-string
* lisp/vc/vc-git.el (vc-git-mode-line-string): Better fix that caches
  the result.
2016-04-27 22:12:12 +08:00
Leo Liu
e55d0db957 Fix revision calculation in vc-git-mode-line-string
* lisp/vc/vc-git.el (vc-git-mode-line-string): Use
  vc-git-working-revision because vc-working-revision needs to decide
  the backend and may return nil.
2016-04-27 13:18:16 +08:00
Dmitry Gutov
87ee542fbc (vc-git-mode-line-string): Don't use `replace-regexp-in-string'
* lisp/vc/vc-git.el (vc-git-mode-line-string): Use `substring'
instead of `replace-regexp-in-string', because REV can be nil
(e.g. when FILE is a directory, bug#23344), and we actually know
we only need the first 4 characters.
2016-04-23 22:16:40 +03:00
Dmitry Gutov
b8d5a8fd1a Remove the Meta-CVS VC backend
* lisp/obsolete/vc-mcvs.el: Remove the file (bug#20475).

* lisp/vc/log-view.el (log-view-extract-comment): Remove the MCVS
reference.

* doc/misc/efaq-w32.texi (Version control): Same.
2016-04-19 01:22:39 +03:00
Michael Albinus
1b98a68b66 Fix Bug#20637. Do not merge to master
* lisp/vc/vc-hooks.el (vc-state, vc-working-revision):
Use `vc-backend' instead of `vc-responsible-backend'.  (Bug#20637)

* test/automated/vc-tests.el (vc-test--state)
(vc-test--working-revision): Deactivate now failing checks.
2016-04-14 20:28:18 +02:00
Paul Eggert
c41ce1cf3d Capitalize “Universal Time” in documentation
It’s a proper noun.
* lisp/vc/add-log.el (add-log-time-zone-rule): Also, fix typo by
mentioning ‘format-time-string’ instead of ‘set-time-zone-rule’.
2016-04-11 15:15:59 -07:00
Eli Zaretskii
668c7bc5ba Improve handling of non-ASCII characters in Git log messages
* lisp/vc/vc-git.el (vc-git-commits-coding-system): Now a defcustom.
(vc-git-log-output-coding-system): New defcustom.
(vc-git-print-log, vc-git-command, vc-git--call): Use
'vc-git-log-output-coding-system' for reading stuff from Git.
Don't override values of 'coding-system-for-read/write' if they
are bound by caller -- this allows the user to force an encoding
via "C-x RET c".
(vc-git-checkin): On MS-Windows, pass the log message via a
temporary file, to work around the limitations on passing
non-ASCII characters via command-line arguments.  Force using the
'locale-coding-system' for Git command-line arguments.  This fixes
problems with non-ASCII commit log messages on MS-Windows.
(Bug#23076)

* etc/NEWS: Mention the new vc-git related defcustoms.
2016-04-10 19:04:33 +03:00
Glenn Morris
9f1786e416 Faces names should not end in "-face".
* lisp/rect.el (rectangle-preview): Rename from rectangle-preview-face.
* lisp/vc/vc-hooks.el (vc-state-base): Rename from vc-state-base-face.
2016-04-08 20:59:21 -04:00
Eli Zaretskii
0020047fda Adapt calls to 'format-time-string' to changes in Emacs 25
* lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries): Use t as the
last argument to format-time-string.  (Bug#23128)
* lisp/gnus/gmm-utils.el (gmm-format-time-string): Use t as the
last argument to format-time-string, when the TZ argument is not a
number, per the doc string.
2016-04-02 14:25:47 +03:00
Eli Zaretskii
17b5152d73 Improve vc-diff with Git backend
* lisp/vc/vc-git.el (vc-git-command): Don't override
coding-system-for-read/write if they are already bound.
Suggested by joaotavora@gmail.com (João Távora).  (Bug#20892)
(vc-git-print-log): Don't override coding-system-for-read if it's
already bound.
2016-04-02 12:25:15 +03:00
Eli Zaretskii
2d02a5f729 ; * lisp/vc/vc-annotate.el (vc-annotate): Clarify commentary. 2016-04-01 23:22:52 +03:00
Eli Zaretskii
e30c3e9a9c Fix EOL decoding in vc-annotate with SVN back-end on MS-Windows
* lisp/vc/vc-annotate.el (vc-annotate): Force DOS EOL decoding on
MS-Windows and MS-DOS, when processing the output of "svn annotate".
2016-03-31 23:01:13 +03:00
Oscar Fuentes
38698b6eaa ; * lisp/vc/vc-hooks.el: corrected docstring of face
Do not merge to master
2016-03-01 04:55:31 +01:00
Glenn Morris
2a5233c3c4 Mark some user options that can get evalled as risky.
* lisp/allout.el (allout-title):
* lisp/emacs-lisp/edebug.el (edebug-global-break-condition):
* lisp/gnus/message.el (message-mailer-swallows-blank-line):
* lisp/progmodes/gud.el (gud-tooltip-display):
* lisp/vc/ediff-mult.el (ediff-default-filtering-regexp):
Mark as risky.
2016-01-30 11:36:41 -08:00
Dmitry Gutov
06083cf41c Don't pass DIR to 'hg status'
* lisp/vc/vc-hg.el (vc-hg-dir-status-files):
Don't pass DIR to 'hg status' (bug#22481).
2016-01-30 06:56:08 +03:00
Stephen Leake
545ad84a8c Fix typo in previous commits
* lisp/progmodes/project.el (project-find-file-in):
* lisp/vc/vc-mtn.el (vc-mtn-find-ignore-file): Fix typo in previous
commit.
2016-01-29 17:53:35 -06:00
Stephen Leake
a71560b0e3 Implement vc-mtn-find-ignore-file, fix some doc strings
* lisp/cedet/cedet-global.el (cedet-gnu-global-root): Improve doc string.

* lisp/cedet/ede/locate.el (initialize-instance): Improve doc string.

* lisp/vc/vc-git.el (vc-git-find-ignore-file): Fix doc string.

* lisp/vc/vc-mtn.el (vc-mtn-find-ignore-file): New function.
2016-01-29 17:46:18 -06:00
Alan Mackenzie
fbce4757a8 Expunge "allow" + infinitive without direct object from source and doc.
Do the same for "permit", "enable", and "prevent".

* doc/emacs/mule.texi:
* doc/lispref/control.texi:
* doc/lispref/display.texi:
* doc/lispref/frames.texi:
* doc/lispref/functions.texi:
* doc/lispref/nonascii.texi:
* doc/lispref/streams.texi:
* doc/lispref/windows.texi:
* doc/misc/dbus.texi:
* doc/misc/eww.texi:
* doc/misc/flymake.texi:
* doc/misc/octave-mode.texi:
* doc/misc/org.texi:
* doc/misc/reftex.texi:
* doc/misc/tramp.texi:
* doc/misc/wisent.texi:
* etc/NEWS:
* lisp/autorevert.el:
* lisp/cedet/mode-local.el:
* lisp/cedet/semantic/senator.el:
* lisp/cedet/semantic/wisent.el:
* lisp/dos-fns.el:
* lisp/frameset.el:
* lisp/gnus/gnus-agent.el:
* lisp/gnus/mm-util.el:
* lisp/international/characters.el:
* lisp/ldefs-boot.el:
* lisp/mail/mailclient.el:
* lisp/man.el:
* lisp/mh-e/mh-search.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-gvfs.el:
* lisp/org/org-crypt.el:
* lisp/org/org-element.el:
* lisp/org/org-feed.el:
* lisp/org/org.el:
* lisp/org/ox-ascii.el:
* lisp/org/ox-icalendar.el:
* lisp/org/ox-publish.el:
* lisp/org/ox.el:
* lisp/play/gamegrid.el:
* lisp/play/gomoku.el:
* lisp/progmodes/antlr-mode.el:
* lisp/progmodes/python.el:
* lisp/progmodes/vhdl-mode.el:
* lisp/strokes.el:
* lisp/textmodes/ispell.el:
* lisp/tree-widget.el:
* lisp/vc/pcvs.el:
* lisp/window.el:
* src/lisp.h:
* src/w32.c:
* src/w32heap.c:
* src/w32term.c:
* src/window.c:
* src/xfaces.c:

Replace solecisms like "This allow to do something" with a correct
alternative, such as "This allow you to do something", "This allows
something to be done" or "This allows the doing of something".
2016-01-24 20:30:39 +00:00
Dmitry Gutov
cca0f93359 ; Account for spaces before the filename 2016-01-10 04:38:34 +03:00
Dmitry Gutov
c71e1e86df Use short date for 'hg annotate', and output the author
* lisp/vc/vc-hg.el (vc-hg-annotate-command):
Change '-d' to '-dq'.  (Bug#21805)
(vc-hg-annotate-switches): Default to "-u" "--follow".
(vc-hg-annotate-re): Update to recognize the short date format
and the optional username.
(vc-hg-annotate-time)
(vc-hg-annotate-extract-revision-at-line): Update accordingly.

* test/automated/vc-hg.el: New file.
2016-01-10 04:13:01 +03:00
Paul Eggert
207e191f1b Fix (error ...) error
Problem reported by Glenn Morris in:
http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00561.html
* lisp/vc/add-log.el (change-log-goto-source): Fix typos
introduced in my Aug 28 change, where I got confused by the
two meanings of (error ...).
2016-01-08 15:10:07 -08:00
Paul Eggert
0e963201d0 Update copyright year to 2016
Run admin/update-copyright.
2016-01-01 01:34:24 -08:00
Eli Zaretskii
dd86e5a227 Document changes in 'compare-windows'
* lisp/vc/compare-w.el (compare-windows-removed)
(compare-windows-added): Doc fix.

* doc/emacs/files.texi (Comparing Files): Document the changes in
window selection by 'compare-windows'.
2015-12-26 18:30:07 +02:00
Eli Zaretskii
78744677ce Improve documentation of 'vc-push'
* doc/emacs/maintaining.texi (Pulling / Pushing): Expand and
improve the documentation of 'vc-push'.

* lisp/vc/vc.el (vc-pull, vc-push): Doc fix.
2015-12-26 17:09:25 +02:00
Dmitry Gutov
f4747f6c51 Use 'hg id' in vc-hg-previous-revision
* lisp/vc/vc-hg.el (vc-hg-previous-revision):
Use 'hg id' to retrieve it (bug#22032).
2015-12-18 06:59:03 +02:00
Eli Zaretskii
acae1834c6 Document 'vc-refresh-state'
* doc/emacs/maintaining.texi (Version Control): Document
'vc-refresh-state'.

* lisp/vc/vc-hooks.el (vc-refresh-state): Doc fix.
2015-12-12 11:17:25 +02:00
Eli Zaretskii
83114ccf77 Avoid errors when creating files under SVN in new directory
* lisp/vc/vc-svn.el (vc-svn-registered): Use
file-accessible-directory-p, to avoid cd'ing to a non-existing
directory, which signals an error on some systems.  (Bug#21984)
(vc-svn-checkin): Call log-edit-extract-headers with 2 arguments.
Use declare-function to avoid byte-compiler warnings.
2015-12-11 12:50:53 +02:00
Anders Lindgren
1143016d04 Fixed subversion vc error when opening file in new directory (bug#21984).
* lisp/vc/vc-svn.el (vc-svn-registered): Check if directory exists.
2015-12-11 07:16:02 +01:00
Dmitry Gutov
02cd9cb8af Check if the file exists on disk before producing the revert diff
* lisp/vc/vc-dispatcher.el (vc-buffer-sync): Check if the file
exists on disk (bug#20558).
2015-11-26 17:15:43 +02:00
Dmitry Gutov
a590713728 Pass SVN commit message through log-edit-extract-headers
* lisp/vc/vc-svn.el (vc-svn-checkin): Pass COMMENT through
log-edit-extract-headers (bug#18954).
2015-11-25 04:10:24 +02:00
Alan Mackenzie
5454708346 Expunge occurrences of `setq' with an odd number of arguments.
* lisp/apropos.el (apropos-documentation):
* lisp/obsolete/complete.el (PC-include-file-all-completions):
* lisp/progmodes/compile.el (compilation-goto-locus):
* lisp/vc/vc-cvs.el (vc-cvs-parse-root): (twice)
Insert missing nil at end of `setq' forms.

* lisp/emacs-lisp/bytecomp.el (byte-compile-file-form-autoload): Remove an
erroneous trailing variable name from a setq, thus allowing a compilation
properly to track functions not defined at runtime.
2015-11-23 14:49:23 +00:00
Dmitry Gutov
2a4362ba62 Work around the asynchronous-empty-diff problem
* lisp/vc/vc-rcs.el (vc-rcs-diff):
* lisp/vc/vc-mtn.el (vc-mtn-diff):
* lisp/vc/vc-hg.el (vc-hg-diff):
* lisp/vc/vc-git.el (vc-git-diff): Ignore the ASYNC argument,
do a synchronous process call (bug#21969).
2015-11-22 07:00:31 +02:00
Dmitry Gutov
3c5989da74 Prioritize looking inside vc-parent-buffer over log-view-mode fallback
* lisp/vc/vc.el (vc-deduce-fileset): Prioritize looking inside
vc-parent-buffer over log-view-mode fallback (bug#21955).
2015-11-19 03:38:36 +02:00
Paul Eggert
ac16149ba4 Fix docstring quoting problems with ‘ '’
Problem reported by Artur Malabarba in:
http://lists.gnu.org/archive/html/emacs-devel/2015-11/msg01513.html
Most of these fixes are to documentation; many involve fixing
longstanding quoting glitches that are independent of the
recent substitute-command-keys changes.  The changes to code are:
* lisp/cedet/mode-local.el (mode-local-augment-function-help)
(describe-mode-local-overload):
Substitute docstrings before displaying them.
* lisp/emacs-lisp/cl-macs.el (cl--transform-lambda):
Quote the generated docstring for later substitution.
2015-11-17 15:29:35 -08:00
Dmitry Gutov
138ad3d93b ; Fix warnings
* lisp/vc/diff-mode.el (diff-kill-applied-hunks):
Fix unused variable warnings.
2015-11-14 03:03:58 +02:00