1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-15 19:31:29 -07:00
Commit graph

130436 commits

Author SHA1 Message Date
Eli Zaretskii
13786d5e7d Exclude blank columns from value of line-number-display-width
* src/indent.c (Fline_number_display_width): Don't add 2 to the
number of columns we return, to make this consistent with
display-line-number-width.
2017-07-07 17:30:06 +03:00
Eli Zaretskii
4caf65d4de Fix vertical-motion across the place where line-number width changes
* src/indent.c (line_number_display_width): New function,
refactored from line-number width calculations in vertical-motion.
(Fvertical_motion): Call line_number_display_width when the width
of line-number display is needed.
(Fline_number_display_width): New defun.
(syms_of_indent): Defsubr it.

* doc/lispref/display.texi (Size of Displayed Text): Document
line-number-display-width.

* etc/NEWS: Mention line-number-display-width.

* lisp/simple.el (last--line-number-width): New internal variable.
(line-move-visual): Use it to adjust temporary-goal-column when
line-number display changes its width.
2017-07-07 12:21:10 +03:00
Martin Rudalics
579a9ee22e Remove Vwindow_text_change_functions and related code
Vwindow_text_change_functions had been provided for implementing
line numbers but apparently was never functional or in use.

* src/xdisp.c (redisplay_window): Remove handling of
Vwindow_text_change_functions.
(syms_of_xdisp): Remove Qwindow_text_change_functions.
(Vwindow_text_change_functions): Remove variable.
* doc/lispref/hooks.texi (Standard Hooks): Remove entry for
`window-text-change-functions'.
2017-07-07 08:40:24 +02:00
Mark Oteiza
51275358e9 Convert more uses of looking-at to following-char
More followup to Karl Fogel's commit a84da83c1.
* lisp/dired-aux.el (dired-add-entry, dired-subdir-hidden-p):
* lisp/dired-x.el (dired-mark-unmarked-files, dired-mark-sexp):
* lisp/help-fns.el (doc-file-to-man, doc-file-to-info):
* lisp/proced.el (proced-toggle-marks):
* lisp/progmodes/f90.el (f90-indent-line):
* lisp/ses.el (ses-load):
* lisp/tar-mode.el (tar-expunge): Replace instances of looking-at with
char comparisons using following-char.
2017-07-06 23:59:58 -04:00
Noam Postavsky
1eefada3f2 Don't skip epg tests (Bug#23561)
* test/lisp/epg-tests.el (with-epg-tests): Ignore REQUIRE-PASSPHRASE
parameter, since we supply the passphrase via pinentry-program for all
GPG versions (as of 2017-02-28 "Fix epg-tests with dummy-pinentry
program (Bug#23619)").
(epg-tests-program-alist-for-passphrase-callback): Remove.
2017-07-06 19:54:07 -04:00
Eli Zaretskii
25bc391161 Implement line numbers that disregard narrowing
* src/xdisp.c (display_count_lines_logically): New function,
counts line numbers disregarding narrowing.  Suggested by Andy
Moreton <andrewjmoreton@gmail.com>.
(maybe_produce_line_number): Call display_count_lines_logically
instead of display_count_lines.  Adapt BEGV, ZV, etc. to
display-line-numbers-widen.
(syms_of_xdisp) <display-line-numbers-widen>: New buffer-local
variable.

* lisp/cus-start.el (standard): Provide a customization form for
display-line-numbers-widen.
* lisp/frame.el: Add display-line-numbers-widen,
display-line-numbers-current-absolute, and
display-line-number-width to the list of variables that should
trigger redisplay of the current buffer.

* doc/emacs/display.texi (Display Custom): Document
display-line-numbers-widen.
2017-07-06 20:22:16 +03:00
Noam Postavsky
386918f0b8 Fix lisp-comment-indent for single-semicolon case
* lisp/emacs-lisp/lisp-mode.el (lisp-comment-indent): Only check for
open paren if we're looking at multiple comment characters.
* test/lisp/emacs-lisp/lisp-mode-tests.el (lisp-comment-indent-1)
(lisp-comment-indent-2): New tests.
2017-07-06 08:59:32 -04:00
Paul Eggert
20e9a00fb5 Spelling fixes
* lisp/org/org-table.el (org-table-sort-lines):
Fix misspelling in prompt.
* lisp/org/ox-ascii.el (org-ascii--describe-datum):
Fix misspelling in call to org-element-lineage.
2017-07-06 00:24:56 -07:00
Michael R. Mauger
7f62a4a744 Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs 2017-07-05 23:37:13 -04:00
Noam Postavsky
7a0170de20 Don't put whitespace between open paren and comment in Lisp modes (Bug#19740)
* lisp/emacs-lisp/lisp-mode.el (lisp-comment-indent): If current
line's code ends in open paren, set comment indentation exactly to
column following it.
(lisp-mode-variables): Set `comment-indent-function' to
`lisp-comment-indent'.
2017-07-05 22:52:36 -04:00
Noam Postavsky
e832febfb4 Allow comment-indent-functions to specify exact indentation (Bug#385)
* lisp/newcomment.el (comment-choose-indent): Interpret a cons of two
integers as indicating a range of acceptable indentation.
(comment-indent): Don't apply `comment-inline-offset',
`comment-choose-indent' already does that.
(comment-indent-function):
* doc/emacs/programs.texi (Options for Comments): Document new
acceptable return values.
* etc/NEWS: Announce it.
2017-07-05 22:52:35 -04:00
Paul Eggert
018600f896 Check for integer overflow in xbm images
* src/image.c (XBM_TK_OVERFLOW): New constant.
(xbm_scan): Check for integer overflow instead of relying on
undefined behavior.  Check that octal digits are actually octal.
2017-07-05 18:59:31 -07:00
Paul Eggert
d6662694d0 Convert hex digits more systematically
This makes the code a bit smaller and presumably faster, as
it substitutes a single lookup for conditional jumps.
* src/character.c (hexdigit): New constant.
(syms_of_character) [HEXDIGIT_IS_CONST]: Initialize it.
* src/character.h (HEXDIGIT_CONST, HEXDIGIT_IS_CONST): New macros.
(hexdigit): New decl.
(char_hexdigit): New inline function.
* src/charset.c: Do not include c-ctype.h.
* src/charset.c (read_hex):
* src/editfns.c (styled_format):
* src/image.c (xbm_scan):
* src/lread.c (read_escape):
* src/regex.c (ISXDIGIT) [emacs]:
Use char_hexdigit insted of doing it by hand.
2017-07-05 18:59:31 -07:00
Paul Eggert
24faf6b0d2 Don’t use -Woverride-init
I have some further changes in mind that would also need to
disable the -Woverride-init warnings.  In practice these warnings
seem to be more trouble than they’re worth, so disable them in the
cc command line.
* configure.ac: Disable -Woverride-init here ...
* src/bytecode.c: ... rather than here.
2017-07-05 18:59:30 -07:00
Glenn Morris
94b2e1fc00 * lisp/progmodes/python.el (auto-mode-alist): Add .pyi. (Bug#27847) 2017-07-05 15:21:28 -04:00
Glenn Morris
0fda6d53e3 ; Standardize some copyright and license notices 2017-07-05 14:08:35 -04:00
Glenn Morris
26a308ea11 * lisp/org/ox-html.el (org-html-infojs-template): Update copyright. 2017-07-05 14:07:14 -04:00
Glenn Morris
8ad9567a49 Small fix for bug-reference.el
* lisp/progmodes/bug-reference.el (bug-reference-bug-regexp):
Autoload safety property.  (Bug#27481)
2017-07-05 13:32:26 -04:00
Michael Albinus
17efc48000 Suppress timers in Tramp
* lisp/net/tramp.el (tramp-file-name-handler): Don't trigger timers.

* test/lisp/net/tramp-tests.el
(tramp-test36-asynchronous-requests): Trigger timers.
(tramp-test37-recursive-load, tramp-test38-remote-load-path):
Set `default-directory' to a trustworthy value.
2017-07-05 17:03:42 +02:00
rocky
66dd3dc0ea Add realgud face definitions 2017-07-05 10:36:31 -04:00
rocky
5d62247323 Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs 2017-07-04 22:39:32 -04:00
rocky
4448c83c95 Add realgud faces to tdsh-dark-theme 2017-07-04 22:37:52 -04:00
Stefan Monnier
326d0ee424 * lisp/progmodes/cc-awk.el: Mark unused args 2017-07-04 22:30:33 -04:00
Stefan Monnier
709b985e61 * lisp/progmodes/cc-bytecomp.el: Mark unused args 2017-07-04 22:29:49 -04:00
Stefan Monnier
dbc9b15392 * lisp/progmodes/cc-defs.el (lookup-syntax-properties): Move ...
... before first use
2017-07-04 22:27:51 -04:00
Stefan Monnier
71e14f3b61 * lisp/progmodes/cc-vars.el: Mark unused args 2017-07-04 22:26:20 -04:00
Stefan Monnier
d36fcad30b * lisp/progmodes/cc-langs.el: Mark unused args
(c-primary-expr-regexp): Remove unused vars ambiguous-prefix-ops and
unambiguous-prefix-ops.
2017-07-04 22:23:57 -04:00
Stefan Monnier
079d9a38e4 * lisp/progmodes/cc-engine.el: Mark unused args
(c-beginning-of-statement-1, c-guess-basic-syntax):
Remove unused var c-in-literal-cache.
(c-debug-sws-msg): Silence byte-compiler, even if we don't use the arg.
(c-append-to-state-cache): Remove unused var `bra+1s'.
(c-remove-stale-state-cache): Remove unused var `pps-point-state'.
(c-invalidate-state-cache-1): Remove unused var `pa'.
(c-forward-decl-or-cast-1): Change comments so they don't look like
outline headers.
(c-restricted-<>-arglists, c-parse-and-markup-<>-arglists):
Declare before first use.
(c-forward-decl-or-cast-1): Remove unused var `backup-kwd-sym'.
(c-backward-over-enum-header): Remove unused var `up-sexp-pos'.
2017-07-04 22:20:22 -04:00
Stefan Monnier
2fb15dcbbb * lisp/progmodes/cc-cmds.el: Remove unused vars
(c-syntactic-context): Declare as dynbound.
(c-beginning-of-defun, c-end-of-defun): Remove unused var `start'.
2017-07-04 22:00:35 -04:00
Stefan Monnier
b78cf15118 * lisp/progmodes/cc-guess.el: Remove unused var
(c-guess-view-reorder-offsets-alist-in-style): Remove redundantly bound
and computed variable `guessed-syntactic-symbols'.
2017-07-04 21:55:44 -04:00
Stefan Monnier
bc0b138451 * lisp/progmodes/cc-align.el: Mark unused arguments 2017-07-04 21:46:05 -04:00
Stefan Monnier
92e64db7e9 * lisp/progmodes/cc-mode.el: Mark unused arguments
(c-parse-quotes-before-change, c-parse-quotes-after-change):
Remove unused vars.
2017-07-04 21:33:00 -04:00
Noam Postavsky
684db44ea2 Mention `ffap-url-unwrap-local' in find-file-at-point's docstring (Bug#27564)
* lisp/ffap.el (find-file-at-point): Mention `ffap-url-unwrap-local'
and `ffap-url-unwrap-remote'.
2017-07-04 20:06:06 -04:00
Noam Postavsky
2a9d7394e3 Fix infloop in uncomment-region-default (Bug#27112)
When `comment-continue' has only blanks, `comment-padright' produces a
regexp that matches the empty string, so `uncomment-region-default'
will loop infinitely.
* lisp/newcomment.el (comment-padright): Only return a regexp if STR
has nonblank characters.
2017-07-04 20:04:42 -04:00
Eli Zaretskii
d5f8a3d03f Fix display of current line number in visual mode
* src/xdisp.c (maybe_produce_line_number): Fix visual-mode display
of current line when line-number-current-line face was customized.
Reported by Filipe Silva <filipe.silva@gmail.com>.
2017-07-04 18:43:03 +03:00
Philipp Stephani
903c874d10 ; Remove unused text properties in test
* test/lisp/electric-tests.el (electric-quote-markdown-in-code):
Remove now-unused text properties.
2017-07-03 23:26:08 +02:00
Michael R. Mauger
776635c01a Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs 2017-07-03 15:32:41 -04:00
Philipp Stephani
4cd0db3d6e Use hook instead of face list to inhibit electric quoting
This is more flexible and doesn't couple electric quoting to font
locking.
Give that 'electric-quote-code-faces' was just introduced, remove it
without formal deprecation.

* lisp/electric.el (electric-quote-inhibit-functions): New abnormal
hook variable.
(electric-quote-post-self-insert-function): Run the hook.  Remove
use of old 'electric-quote-code-faces' variable.

* test/lisp/electric-tests.el (electric-quote-markdown-in-text)
(electric-quote-markdown-in-code): Adapt unit tests.
2017-07-03 20:59:31 +02:00
Ingo Lohmar
9ac7dccc51 Offer non-aligned indentation in lists in js-mode (Bug#27503)
* lisp/progmodes/js.el (js--proper-indentation):
New customization option 'js-indent-align-list-continuation'.
Affects argument lists as well as arrays and object properties.
* test/manual/indent/js-indent-align-list-continuation-nil.js:
Test the change.
2017-07-03 20:06:27 +02:00
Eli Zaretskii
52bfb7d4d6 Avoid errors in vertical-motion when buffer is narrowed
* src/indent.c (Fvertical_motion): If need to start from
window-start, and it is outside of the accessible portion,
temporarily widen the buffer.  This avoids errors in evil-mode.
Reported by James Nguyen <james@jojojames.com>.
2017-07-03 18:57:01 +03:00
Michael Albinus
caf9244980 (Re-)activate remote tests of filenotify-tests.el
* test/lisp/filenotify-tests.el
(file-notify-test-remote-temporary-file-directory):
Declare default host for mock method.  Offer home directory
for mock method if it doesn't exist.
(file-notify-test09-watched-file-in-watched-dir-remote):
Remove, it doesn't work reliably.
2017-07-03 16:12:10 +02:00
Noam Postavsky
37cdfec7c7 Reset ansi escape context before printing eshell prompt (Bug#27407)
* lisp/eshell/em-prompt.el (eshell-emit-prompt): Reset
`ansi-color-context-region'.
2017-07-03 10:09:41 -04:00
Noam Postavsky
4ebdcc46ab Let ansi-color overlay hooks work in eshell (Bug#27407)
* lisp/ansi-color.el (ansi-color-make-extent): Add
`ansi-color-freeze-overlay' to `insert-behind-hooks' as well.
* lisp/eshell/esh-mode.el (eshell-output-filter): Let-bind
`inhibit-modification-hooks' to nil while inserting the string.
2017-07-03 10:09:40 -04:00
Noam Postavsky
35ed01dfb3 Fix and simplify ansi escape detection (Bug#21381)
* lisp/ansi-color.el (ansi-color-regexp, ansi-color-drop-regexp):
Remove.
(ansi-color-control-seq-regexp): New constant, matches all escape
sequences.
(ansi-color-filter-apply, ansi-color-apply)
(ansi-color-filter-region, ansi-color-apply-on-region): Use it instead
of matching color sequences separately from ignored sequences.
Differentiate color sequences simply by checking the last character.
2017-07-03 10:09:40 -04:00
Damien Cassou
a7754a250b Add absolute optional parameter to line-number-at-pos (Bug#26417)
* lisp/simple.el (line-number-at-pos): Add a second optional
  argument 'absolute'.
* test/list/simple-tests.el: Add tests for 'line-number-at-pos'.
2017-07-03 14:43:02 +02:00
R. Bernstein
2d846eece7 Add realgud faces 2017-07-03 08:29:05 -04:00
Michael Albinus
62504a9f5d Fix tramp-tests.el for hydra
* test/Makefile.in: Remove instrumentation for tramp-tests.

* test/lisp/net/tramp-tests.el (tramp-test36-asynchronous-requests):
Remove instrumentation.  Wrap with a timeout.  Give hydra
another timer value.  Set `default-directory' in timer.
2017-07-03 13:21:39 +02:00
Michael Albinus
71169d5185 ; Instrument tramp-tests.el 2017-07-03 09:21:32 +02:00
Bastien
1e60ee871d Merge branch 'master' into scratch/org-mode-merge 2017-07-03 09:09:31 +02:00
Bastien
5ca1888fe6 Merge branch 'master' into scratch/org-mode-merge 2017-07-03 09:06:29 +02:00