Eli Zaretskii [Wed, 7 Mar 2018 18:40:44 +0000 (20:40 +0200)]
Fix display of TABs in hscrolled windows with line numbers
* src/dispextern.h (struct it): New members tab_offset and
line_number_produced_p.
* src/xdisp.c (display_line): Don't set row->x to a negative value
if line numbers are being displayed. (Bug#30582)
Reset the line_number_produced_p flag before laying out the glyph
row.
(x_produce_glyphs): Use the line_number_produced_p flag to decide
whether to offset the X coordinate due to line-number display.
Use the tab_offset member to restore the original TAB width for
alignment purposes.
(move_it_in_display_line_to): Don't produce line numbers when moving
in hscrolled window to the left of first_visible_x.
(maybe_produce_line_number): Set the line_number_produced_p flag.
(Bug#30584)
* src/term.c (produce_glyphs): Correct TAB width only when
line_number_produced_p flag is set.
Paul Eggert [Mon, 5 Mar 2018 01:53:07 +0000 (17:53 -0800)]
uniqify -> uniquify
The latter spelling is more common both within Emacs and in
English-language sources in general (Bug#10048).
* lisp/eshell/esh-util.el (eshell-uniquify-list):
Rename from eshell-uniqify-list. All callers changed.
* lisp/pcomplete.el (pcomplete-uniquify-list):
Rename from pcomplete-uniqify-list. All callers changed.
Paul Eggert [Mon, 5 Mar 2018 01:38:43 +0000 (17:38 -0800)]
Spelling fixes (Bug#10068)
* lisp/gnus/gnus-score.el (gnus-score-find-favorite-words):
Rename from gnus-score-find-favourite-words.
* lisp/hfy-cmap.el (hfy-fallback-color-map)
(hfy-rgb-txt-color-map, hfy-fallback-color-values):
* lisp/htmlfontify.el (hfy-color-vals, hfy-color):
Rename from names that used 'colour' instead of 'color'.
Paul Eggert [Mon, 5 Mar 2018 01:16:39 +0000 (17:16 -0800)]
Merge from origin/emacs-26
f2caf08ca6 ; Spelling fixes f0e5f220b6 * lisp/progmodes/grep.el (zrgrep): a0f71260f8 Minor copyedits in doc/emacs/text.texi adfe2f580f Remove outdated comment in syntax.el b80e15b6a6 Prevent Flyspell from changing unrelated words e385599457 Avoid errors in flymake in builds --without-x d691e30cb0 More improvements of the Emacs manual
Juri Linkov [Sat, 3 Mar 2018 22:33:30 +0000 (00:33 +0200)]
* lisp/isearch.el (search-exit-option): Add options ‘shift-move’ and ‘move’.
Change type from ‘boolean’ to ‘choice’. Extend docstring.
(isearch-pre-move-point): New variable.
(isearch-pre-command-hook, isearch-post-command-hook):
Handle search-exit-option for values ‘move’ and ‘shift-move’.
* doc/emacs/search.texi (Not Exiting Isearch): Document new
values ‘shift-move’ and ‘move’ of search-exit-option.
Eli Zaretskii [Sat, 3 Mar 2018 09:50:24 +0000 (11:50 +0200)]
More improvements of the Emacs manual
* doc/emacs/rmail.texi (Rmail Reply, Rmail Sorting): Improve
wording. Suggested by Daniel Chakraborty
<danielmchakraborty@gmail.com>.
* doc/emacs/glossary.texi (Glossary): Add cross-references.
Improve and clarify wording. Suggested by Gijs Hillenius
<gijs@hillenius.net> in emacs-manual-bugs@gnu.org.
* doc/emacs/text.texi (Org Authoring): Add more supported formats
to the list.
(TeX Print): Improve wording. Slightly rearrange stuff.
(TeX Misc): Mention doctex-mode-hook.
(Two-Column): Minor rearrangement of text. Suggested by Michael
Albinus <michael.albinus@gmx.de> in emacs-manual-bugs@gnu.org.
* doc/emacs/misc.texi (Saving Emacs Sessions):
* doc/emacs/programs.texi (Program Modes): Remove redundant text
and index entries.
Dmitry Gutov [Wed, 28 Feb 2018 02:03:16 +0000 (04:03 +0200)]
Backport: xref--next-error-function: Move xref's window point
* lisp/progmodes/xref.el (xref--next-error-function): Move
xref's window point if it's visible. When we don't do that,
navigation can start looping after a while.
Eli Zaretskii [Fri, 2 Mar 2018 08:44:44 +0000 (10:44 +0200)]
Fix downloading non-text files in EWW
* lisp/net/eww.el (eww-download-callback): Bind
coding-system-for-read to 'no-conversion', to avoid any code- or
EOL-conversions in downloaded files. (Bug#30664)
Noam Postavsky [Fri, 2 Mar 2018 02:52:27 +0000 (21:52 -0500)]
Fix issues turned up by previous python.el change
See [1] for more discussion.
* lisp/progmodes/python.el (python--prettify-symbols-alist): Define
the obsolete alias before the variable proper, so that we correctly
get the user's settings regardless of which name they set.
(python-nav-end-of-statement): Add missing backslash.
(python-shell-send-file): Call `expand-file-name' before
`file-local-name', the expansion of "~" could be different on remote
filenames.
(python-mode): Declare prettify-symbols-alist instead of checking if
it's bound. Use the non-obsolete python-prettify-symbols-alist name,
rather than checking if the obsolete name is bound (it always is too,
but the Emacs 24 byte compiler doesn't recognize that
define-obsolete-variable-alias defines a variable).
Paul Eggert [Fri, 2 Mar 2018 01:58:26 +0000 (17:58 -0800)]
Arrange for loaddefs files to be greppable
Without this change, ldefs-boot.el contains a couple of stray NUL
bytes, which cause it to be considered to be a non-text file by
tools like GNU grep.
* lisp/emacs-lisp/autoload.el (autoload-print-form):
Set print-escape-control-characters to t.
Paul Eggert [Fri, 2 Mar 2018 01:58:26 +0000 (17:58 -0800)]
Improve octal-escape output in bool vectors and strings
* src/print.c (octalout): New function.
(print_vectorlike): When printing bool vectors, use
octal escapes for control characters when
print-escape-control-characters is non-nil, so that
the printed representation avoids encoding issues.
Rename locals to avoid byte-vs-char confusion.
(print_object): Don't output unnecessary zeros when
printing octal escapes. Simplify by using octalout.
Paul Eggert [Fri, 2 Mar 2018 00:24:41 +0000 (16:24 -0800)]
make-docfile: minor fixes and cleanups
* lib-src/make-docfile.c: Include c-ctype.h.
(read_c_string_or_comment, write_c_args, scan_c_stream, skip_white)
(read_lisp_symbol, scan_lisp_file):
Prefer c_isspace etc. to listing characters by hand.
(read_c_string_or_comment): Simplify.
(scan_c_stream, read_lisp_symbol): Use true for boolean 1.
(scan_c_stream): Fix typo (c >= 'Z' && c <= 'Z').
Minor rewrites to avoid duplicate code.
(scan_c_stream, read_lisp_symbol, scan_lisp_file):
Avoid infloop if at EOF.
(skip_white, read_lisp_symbol): Don’t stuff getc result into
‘char’, as this mishandles EOF.
Eli Zaretskii [Thu, 1 Mar 2018 15:51:25 +0000 (17:51 +0200)]
Improve the Emacs manual
* doc/emacs/xresources.texi (Table of Resources): Mention that
some resources are ignored by toolkit builds.
* doc/emacs/custom.texi (Key Bindings): Improve indexing.
(Bug#30530)
Paul Eggert [Thu, 1 Mar 2018 00:27:06 +0000 (16:27 -0800)]
Require a larger stack size for threads on macOS (bug#30364)
* src/systhread.c (sys_thread_create)
[THREADS_ENABLED && HAVE_PTHREAD && DARWIN_OS]:
Require at least 8MB stack size for x64 and 4MB for x86 on macOS.
Do not merge to master.
Glenn Morris [Wed, 28 Feb 2018 17:40:40 +0000 (09:40 -0800)]
Merge from origin/emacs-26
fd50238 (origin/emacs-26) * doc/lispref/streams.texi (Output Variable... 769ea57 Use "GTK+" where applicable in the manual 5e69219 Document print-escape-control-characters c00fea9 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac... a2ab0d0 * doc/emacs/killing.texi (Rectangles): Don't use @key for cha... 6288c3d * lisp/emulation/viper.el: Unbreak it. bf3535e More fixes in the Emacs manual c87d04e Avoid aborts in 'md5' 9743f48 Mark keys consistently in manuals ce557a9 Remove @key{} markups from @kindex entries in manuals 71243f0 * doc/emacs/display.texi (Standard Faces): Fix markup of inde... 7a069f3 Fix @kindex entries in manuals 6218933 Fix @cindex entries in manuals 57c9f12 Merge branch 'emacs-26' of git.sv.gnu.org:/srv/git/emacs into... e415309 Fix @cindex entries in org.texi 560a23e Document reserved keys 105d085 * doc/misc/ebrowse.texi: Use @key{} for keys.
Dmitry Gutov [Wed, 28 Feb 2018 02:03:16 +0000 (04:03 +0200)]
xref--next-error-function: Move xref's window point
* lisp/progmodes/xref.el (xref--next-error-function): Move
xref's window point if it's visible. When we don't do that,
navigation can start looping after a while.
Stefan Monnier [Wed, 28 Feb 2018 01:47:23 +0000 (20:47 -0500)]
* lisp/gnus/mm-decode.el: Use lexical-binding and use cl-lib
(mm-display-parts): Remove unused arg 'no-default'. Use 'cond'.
(mm-display-external): Use closures rather than `(lambda ...).
Don't bother with 'lexical-let'.
(mm-insert-part): No need for string-to-multibyte now that
'insert' will do that for us now (it used to behave more like
string-make-multibyte).
(mm-pipe-part): Remove unused var 'name'.
(shr-width, shr-content-function, shr-inhibit-images): Declare.
(mm-shr): Use a closure rather than `(lambda ...).
Noam Postavsky [Wed, 28 Feb 2018 00:44:35 +0000 (19:44 -0500)]
Fix python.el for Emacs 24, bump ELPA version to 0.26.1 (Bug#30633)
Since python.el is distributed via GNU ELPA, it should be functional
in earlier Emacs versions. Also fix some compile warnings.
* lisp/progmodes/python.el: Bump version to 0.26.1. Define
`prog-first-column' and `file-local-name' also at compile time, as
needed.
(inferior-python-mode-hook): Declare for the benefit of Emacs 24.3.
(python-nav-end-of-statement): Fix format string for assertion error.
(python-shell-tramp-refresh-process-environment): Don't `function'
quote a symbol which might not be fbound.
(python-mode): Only use prettify-symbols settings if they're bound.