GitLab

This reverts commit a32eea60.

This reverts commit f7c5f79c.

787df9dd ; * src/keyboard.c (read_char): Fix typos in a comment.

The following commit was skipped:

06ae23aa Handle Bug#23186

b787d550 More format-time-string change fixups
13c8f29c make-xwidget unused arg cleanup
36e05f0b Remove unused arguments from make-xwidget
10422173 Document incompatible changes in 'format-time-string'
7228eb80 Improve documentation of byte-code objects
0020047f Adapt calls to 'format-time-string' to changes in Emacs 25
17b5152d Improve vc-diff with Git backend
c28f87a5 (js--continued-expression-p): Special-case unary plus and minus
2d02a5f7 ; * lisp/vc/vc-annotate.el (vc-annotate): Clarify commentary.
9151f16e Prevent C++ Mode wrongly fontifying some identifiers near tem...
b3b523cd Avoid crashes due to insanely large columns in tabulated-list...
a3daa343 Teach M-x disassemble a default argument.
e30c3e9a Fix EOL decoding in vc-annotate with SVN back-end on MS-Windows
df441b36 Fix OS X specific settings in tramp-tests
22443312 Finish fixing a cacheing bug in CC Mode (see 2016-03-09)

# Conflicts:
#	lisp/net/tramp-sh.el
#	lisp/progmodes/cc-engine.el

* lisp/progmodes/grep.el (grep-process-setup): Allow moving
point to a specific place after finishing the grep command.
(grep-mode): Use it to restore point after traversing the history.
(grep--history-point): New internal variable.
(grep--save-history, grep-forward-history): Use it to restore
the point.

* doc/emacs/building.texi (Grep Searching): Mention the
`r'/`l' commands.

* lisp/progmodes/grep.el (grep-forward-history): New command.
(grep-backward-history): Ditto.
(grep--save-buffers): New function.
(grep): Use it to record the history.
(grep--command-history, grep--history-inhibit)
(grep--history-place): New internal variables for the grep
history (bug#22627).

* lisp/net/tramp.el (tramp-encoding-shell)
(tramp-encoding-command-switch)
(tramp-encoding-command-interactive): Check for
`w32-shell-name'.  (Bug#23186)

* lisp/net/tramp.el (tramp-encoding-command-switch)
(tramp-encoding-command-interactive):
* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
`tramp-encoding-shell' could be nil.  (Bug#23186)

* lisp/net/tramp-cache.el (tramp-get-connection-property)
(tramp-set-connection-property, tramp-connection-property-p)
(tramp-flush-connection-property): Improve docstring.

* lisp/net/tramp-sh.el (tramp-maybe-open-connection): Use it.

* lisp/net/tramp.el (tramp-get-local-locale): New defun.

* test/automated/tramp-tests.el (tramp--test-utf8):
Improve settings of coding systems.  (Bug#22145)

* lisp/net/tramp.el (tramp-encoding-command-switch)
(tramp-encoding-command-interactive):
* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
`tramp-encoding-shell' could be nil.  (Bug#23186)

* lisp/net/tramp-sh.el (tramp-sh-handle-set-file-times):
* lisp/org/org.el (org-timestamp-format):
Fix doc to match new format-time-string behavior.
* lisp/org/ox-icalendar.el (org-icalendar-convert-timestamp):
Use (not (not X)) to treat non-nil values of utc arg as UTC.

* doc/lispref/display.texi (Xwidgets): Remove stray refs.
* src/xwidget.c (syms_of_xwidget): Qwebkit, not Qwebkit_osr.

The arguments BEG and END were unused, and are now removed.

* display.texi (Xwidgets): Document the change
* xwidget.el (make-xwidget, xwidget-insert)
(xwidget-webkit-new-session): Reflect changed arguments
* xwidget.c (Fmake_xwidget, syms_of_xwidget): Reflect changed arguments

The following commit was skipped:

ed19f207 Merge branch 'emacs-25' of /home/acm/emacs/emacs.git/emacs-25...

7c1802f6 * doc/lispref/text.texi (Columns): Remove a nonexistent refer...
9034c50a * doc/man/emacsclient.1: Document +line:column option.
06495c96 Fix rare problems with echo-area display and multiple frames
f99b5129 In M-%, avoid making buffer-local binding of text-property-de...

The following commit was skipped:

124c4861 Remove prog-indentation-context

e65c3079 * src/font.c (QCuser_spec): Add missing colon to :user-spec.
c8b868b1 Don't start the 'midnight' timer twice
278c8a7e * src/xwidget.c (Fxwidget_resize): Fix inappropriate use of X...
e5c17f46 Fix todo-mode category movement
bc70fda2 * lisp/xt-mouse.el (xterm-mouse-utf-8): Add :version.
cf40f389 Ignore non-nil. non-cons values of unread-command-events
8ee4c52a Improve documentatuon of 'truncate-partial-width-windows'
fb9a62c9 * src/ftfont.c (ftfont_shape_by_flt): Parenthesize as per GNU...
1e1ea22e Fix 'dired-goto-file' in Dired buffers produced by find-dired
3a13472a Fix map-put and map-delete for alists (Bug#23105)
422c3dad Minor copyedits of documentation for temporary displays
90fb9b38 Add customization option for using UTF-8 coordinates in xt-mouse
f14d4636 Minor doc string fixes in replace.el
e70ee9d6 Fix scrolling upwards with 'xwidget-webkit-browse-url'
44782dea Fix display of Indic scripts
326c64fc Fix splash screen display at startup
7ab2a974 ; In NEWS mention new display of minibuffer completions window
a1cd84cf Describe temporary displays in Emacs manual
5ec10564 Avoid stray As next to IDLW icons
45577d54 Avoid GTK 3 crash with icons and masks
e99ff6e8 * lisp/minibuffer.el (minibuffer-completion-help): Use fit-wi...
077b78cf Define make_save_ptr_ptr unconditionally
20a1003f Preserve current buffer when popping up TTY menus
7eba90c1 Improve font selection by family on MS-Windows
73d213f2 Comint, term, and compile now set EMACS
9524ec5e Ignore more merges when generating ChangeLog
ad250f2b Sync with gnulib
c0165ea4 Resurrect GNUS-NEWS autogeneration
1e5327c7 ; Backport ChangeLog.2 fixes from master
e643977b Make `toggle-frame-maximized' respect the dock on OS X (bug#2...
38a43f1a Fix bug in displaying header line with a box face
91e66769 Fix an Isearch var to be a string (Bug#23038)
76ef5226 Fix (args-out-of-range 1) error in cursor-sensor--detect
8a35f83c Render empty <ul><li><ul> correctly
d8b2ce5f Ignore invalid base64 encoded embedded images
52ba24bd Fix <p> and <div> newlines with or without <li> in shr
b8ea08b0 Avoid errors in 'newline'
fc3cd539 Fix Bug#23032
dd2737b3 Adjudicate review comments in abbrevs.texi
26f9c507 Fixup the "normal" matcher; highlight global var symbols, too
413e73b5 ; Small theme additions
cd950da9 Honor prefix arg in doc-view-next-line-or-next-page
ed909c04 ; Spelling fixes
6da3a6dc Port to strict C99 offsetof
de7601f1 Port to GTK with strict C11 compiler
658aa2da Port to GTK with strict C99 compiler
1df7173e Avoid screen artifacts with new OS X visible bell after scrol...
7a2edd34 Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into...
dca240a7 Suppress some Tramp tests for OSX, do not merge with master
9094304a * lisp/progmodes/xref.el (xref-buffer-name, xref--window): Mo...
cbedfc26 * lisp/gnus/mm-decode.el (gnus-format-message): Autoload it.
005ac7c2 * lisp/mail/rmail.el (rmail-mime-entity-truncated): Declare.
9ab03f27 ; Auto-commit of loaddefs files.
56df6171 Address compilation warnings due to 2016-01-03 mml refactoring.
a1ef911f * lisp/emacs-lisp/smie.el (smie-indent-keyword): Don't burp i...
79ae7fbe * lisp/dired-x.el (dired-omit-here-always): Correct error mes...
253929fe * lisp/dired-x.el (dired-omit-here-always): Replace undefined...
ce533897 * lisp/xml.el (xml-parse-tag-1): Replace undefined function.
d6d164f6 Avoid segfaults due to frame image cache being absent
bc7f6f63 Improve documentation of glyphless-character display
6b6916e8 ; * src/xdisp.c (with_echo_area_buffer): Fix typos in comments.
ee9a1f7e Support safe navigation operator in non-SMIE indentation code
c3ed95b1 Move xsd:base64Binary decoding fix to debbugs.el 0.9.1
2036be46 Fix Ruby's operator precedence
1d686c2a (ruby-interpolation-inside-another-interpolation): New failin...
7950e1dd Port to clang 3.7.0 on x86-64
218ae590 * test/automated/package-test.el (package-test-signed): Tweak...
ba33b7c4 Sync with gnulib
38b276d1 Fix startup of "emacs -nw" on systems that CANNOT_DUMP
dbfbedd3 Do not tokenize a comment before continuation as ';'
04036200 Don't misindent arguments of a method call inside continuation
e6776f83 * src/keyboard.c (echo_keystrokes_p): Don't test cursor_in_ec...
8475f3da ASCII-only etc/NEWS etc.
5cc69193 Fix a cacheing bug, which led to inordinately slow c-beginnin...
0ce37eac Fix Isearch prompt when invoked with an argument
f3033d4d Fix a typo in the Emacs manual
4235d2d9 Curved quotes in etc/NEWS etc.
26b56dc7 Fix some single quotes in documentation
80ec484a Make lisp-completion-at-point's argument optional
9d463aec Tweak the left precedence of '=>'
5b705bc9 Indent '.' relative to the first sibling expression
04f5525f Make '.' associative, for easier sexp navigation
ba24c99e Revert "Simplify "Visit New File" to "New File""

Use #' to quote functions.
(erc-server-delayed-reconnect): Remove unused arg `event'.
(erc-process-sentinel-2): Adjust accordingly.
Don't pass `err' to condition-case if we don't use it.
(define-erc-response-handler): Use add-hook rather than add-to-list.
(NICK): Use cl-pushnew rather than add-to-list.
(331): Remove unused var `topic'.
(352): Remove unused var `hopcount'.

* etc/NEWS: Mention the incompatible change in the interpretation
of the 3rd argument to 'format-time-string'.  (Bug#21943)

* doc/lispref/compile.texi (Byte-Code Objects): Document the
integer format of the argument descriptor.  (Bug#23061)

* 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.

* src/eval.c (Ffunc_arity): Support Lisp macros as well.

* src/w32xfns.c (init_crit, delete_crit) [HAVE_W32NOTIFY]: Only
initialize and free the notification set if compiling with
w32notify feature.

* 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.

* lisp/progmodes/js.el (js--continued-expression-p): Make an
effort to recognize unary plus and minus, in the contexts where
they make sense (https://github.com/mooz/js2-mode/issues/322).

Problem reported by Matthias Clasen (Bug#23144).
* src/xterm.c (handle_one_xevent) [USE_GTK]:
Do not call xg_frame_resized.

This fixes debbugs #7917.

* lisp/progmodes/cc-engine.el (c-forward-keyword-prefixed-id): Accept 'maybe
(from c-forward-type) as sufficient to record an id.  Record type id as well
as ref ids.
(c-forward-name): Bind c-last-identifier-range around the call to
c-forward-<>-arglist to prevent it getting corrupted.  Don't automatically
assume an identifier is a type when a template ">" is followed by a "(".
(c-forward-type): Don't automatically assume an identifier is a type when a
template ">" is followed by a "(".

* lisp/progmodes/cc-fonts.el (c-font-lock-<>-arglists): Don't fontify an
identifier as a type when its associated ">" is followed by a "(".

* src/xdisp.c (append_stretch_glyph, produce_xwidget_glyph)
(produce_image_glyph): Limit the pixel width of the produced glyph
to SHRT_MAX.  (Bug#23178)
(append_composite_glyph, append_glyph, append_glyphless_glyph):
Add assertions to verify that the pixel width of the glyph will
never overflow a 'short'.
* src/term.c (append_composite_glyph): Add assertion to verify
that the pixel width of the glyph will never overflow a 'short'.

* src/emacs-module.c (check_vec_index): New function.
(module_vec_set, module_vec_get): Use it instead of a
not-strict-enough check.

Adopts default argument in the same way as `describe-function'.
* lisp/emacs-lisp/disass.el (disassemble): Default to function at point,
if any.

* lisp/vc/vc-annotate.el (vc-annotate): Force DOS EOL decoding on
MS-Windows and MS-DOS, when processing the output of "svn annotate".

lisp/textmodes/css-mode.el (css--bang-ids): New buffer-local variable
holding the list of bang-rules for the current mode.
(css--font-lock-keywords): Retrieve bang-rules from `css--bang-ids'
instead of computing them.
(css--complete-bang-rule): New function for completing a bang-rule.
(css-completion-at-point): Add support for completing bang-rules.
(scss-font-lock-keywords): Change from a variable to a function in
order to recompute `css--font-lock-keywords' when `css--bang-ids' has
changed.
(scss-mode): Set `css--bang-ids' and recompute font-lock keywords.

* lisp/net/tramp-sh.el (tramp-maybe-open-connection): Use it.

* lisp/net/tramp.el (tramp-get-local-locale): New defun.

* test/automated/tramp-tests.el (tramp--test-darwin-p): Remove.
(tramp--test-utf8): Improve settings of coding systems.
Do not use `tramp--test-darwin-p' anymore.  (Bug#22145)

* lisp/progmodes/cc-cmds.el: (c-beginning-of-defun, c-end-of-defun): Remove
superfluous invocations of c-self-bind-state-cache.

* lisp/progmodes/cc-defs.el: (c-self-bind-state-cache): Copy and terminate
markers correctly.

* lisp/progmodes/cc-engine.el (c-record-parse-state-state): Terminate stale
markers.