1. 14 Mar, 2017 9 commits
    • Paul Eggert's avatar
      Merge from gnulib · fac0bb9c
      Paul Eggert authored
      This incorporates:
      2017-03-14 snippets: move unadjusted snippet sources to lib
      2017-03-14 gnulib-tool: fix typo in comment output
      2017-03-14 snippets: work around GNU Make 3.82 VPATH
      2017-03-13 gnulib-tool: minor --gnu-make fixups
      2017-03-12 gnulib-tool: new option --gnu-make
      * .gitignore: Remove lib/arg-nonnull.h, lib/c++defs.h,
      lib/warn-on-use.h.  Change exception from
      build-aux/snippet/_Noreturn.h to lib/_Noreturn.h.
      * admin/authors.el (authors-renamed-files-regexps):
      * admin/notes/copyright, make-dist:
      The snippet files moved from build-aux/snippet to lib.
      * lib/_Noreturn.h: Rename from build-aux/snippet/_Noreturn.h.
      * lib/arg-nonnull.h: Rename from build-aux/snippet/arg-nonnull.h.
      * lib/c++defs.h: Rename from build-aux/snippet/c++defs.h.
      * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
      * lib/warn-on-use.h: Rename from build-aux/snippet/warn-on-use.h.
      fac0bb9c
    • Michael Albinus's avatar
      5a64d788
    • Michael Albinus's avatar
      Reenable lost Tramp test case · a568d0a7
      Michael Albinus authored
      * test/lisp/net/tramp-tests.el (tramp-test24-file-name-completion):
      Reenable lost test case.
      a568d0a7
    • Alan Third's avatar
      Revert "Remove NSEvent loop from ns_select (bug#25265)" · 726c6c97
      Alan Third authored
      This reverts commit 3bd2e9e9.
      726c6c97
    • Alan Third's avatar
      Revert "Add missing timeout value in ns_select" · 9bfa7973
      Alan Third authored
      This reverts commit a6523621.
      9bfa7973
    • Alan Third's avatar
      Remove old macOS compatibility code · ea5a7f99
      Alan Third authored
      * src/nsimage.m, src/nsmenu.m, src/nsterm.m: Remove code only for
      macOS versions below 10.6 as they are not supported in Emacs 25+.
      ea5a7f99
    • Michael Albinus's avatar
      Tune `tramp-completion-file-name-regexp-unified' · 19a04b4c
      Michael Albinus authored
      * lisp/net/tramp.el (tramp-completion-file-name-regexp-unified):
      Extend this regexp to match also "/".
      19a04b4c
    • Tino Calancha's avatar
      Show ancestor buffer in 3way merges · 0f3d1b78
      Tino Calancha authored
      Add an option ediff-show-ancestor', to control if the ancestor buffer
      must be shown in 3way merges (Bug#25493); set it non-nil by default.
      Add a toggle to change this option interactively; the original
      value of the option is restored on exit.
      
      Update the window setup so that the ancestor buffer is
      shown in 3way merges when ediff-show-ancestor is non-nil.
      
      Any operation on ediff windows must take in account the
      ancestor window as well, when this is shown.
      
      * lisp/vc/ediff-init.el (ediff-show-ancestor): New option.
      (ediff--show-ancestor-orig): New defvar.
      * lisp/vc/ediff-wind.el (ediff-window-Ancestor): New defvar.
      (ediff-setup-windows-plain-merge, ediff-setup-windows-multiframe-merge):
      Display ancestor buffer if ediff-show-ancestor is non-nil.
      (ediff-keep-window-config): Expect ancestor window in
      ediff-window-config-saved.
      (ediff-window-alist): Add entry for the ancestor window.
      * lisp/vc/ediff-util.el (ediff-setup-control-buffer):
      ediff-window-config-saved contains ancestor window.
      (ediff-show-ancestor): Delete this command.
      (ediff-setup-keymap): Bind ediff-toggle-show-ancestor to '/' for merge jobs.
      (ediff-update-diffs): Compute new diffs using ancestor buffer in 3way merges;
      don't cheat it to think that is performing a comparison, that trick is not
      necessary anymore: simply call 'ediff-setup-diff-regions-function'
      with file-A, file-B and the file ancestor.
      (ediff-recenter): Update doc string.  Consider the ancestor buffer.
      (ediff--check-ancestor-exists): New defun.
      (ediff-toggle-show-ancestor): New command; toggle ediff-show-ancestor.
      (ediff--restore-options-on-exit): Restore ediff-show-ancestor on exit.
      (ediff-scroll-vertically, ediff-scroll-horizontally)
      (ediff-operate-on-windows): Consider the ancestor as well.
      * lisp/vc/ediff-help.el (ediff-long-help-message-merge):
      List ediff-toggle-show-ancestor.
      * doc/misc/ediff.texi (Introduction, Quick Help Commands): Update manual.
      ; * etc/NEWS: Announce these changes.
      0f3d1b78
    • Tino Calancha's avatar
      diff-mode: Improve default faces for buffer ancestor · e39d5934
      Tino Calancha authored
      * lisp/vc/ediff-init.el (ediff-current-diff-Ancestor)
      (ediff-fine-diff-Ancestor): Use defaults consistent with
      faces for 'ediff-buffer-A' and 'ediff-buffer-B'.
      e39d5934
  2. 13 Mar, 2017 8 commits
    • Paul Eggert's avatar
      Fix make-dist typo · 84b6bc9e
      Paul Eggert authored
      * make-dist: Fix typo introduced in the Bug#25895 fix.
      84b6bc9e
    • Michael Albinus's avatar
      a608330b
    • Michael Albinus's avatar
      Require method in remote file name syntax · ed33337c
      Michael Albinus authored
      * lisp/minibuffer.el (completion--nth-completion):
      Do not bind `non-essential'.
      
      * lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
      * lisp/net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
      * lisp/net/tramp-sh.el (tramp-maybe-open-connection):
      * lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection): Do not call
      `tramp-check-proper-method-and-host'.
      
      * lisp/net/tramp-sh.el (tramp-ssh-controlmaster-options): Better traces.
      (tramp-maybe-open-connection): Do not use argument for
      ´tramp-completion-mode-p'.
      
      * lisp/net/tramp.el (tramp-default-method-marker): New defconst.
      (tramp-prefix-format, tramp-postfix-method-format)
      (tramp-prefix-ipv6-format, tramp-postfix-ipv6-format)
      (tramp-prefix-port-format, tramp-postfix-host-format)
      (tramp-file-name-regexp, tramp-completion-file-name-regexp):
      Use `eq' instead of `eqal'.
      (tramp-method-regexp, tramp-domain-regexp)
      (tramp-remote-file-name-spec-regexp)
      (tramp-file-name-regexp-unified)
      (tramp-completion-file-name-regexp-unified)
      (tramp-completion-file-name-regexp-separate): Adapt regexp.
      (tramp-completion-file-name-handler-alist)
      (tramp-run-real-handler): Autoload them.
      (tramp-find-method): Handle `tramp-default-method-marker'.
      (tramp-check-proper-method-and-host)
      (tramp-completion-run-real-handler): Remove them.
      (tramp-error-with-buffer, tramp-connectable-p): Do not use
      argument for ´tramp-completion-mode-p'.
      (tramp-find-foreign-file-name-handler): Remove COMPLETION
      argument.  Do not apply heuristic for completion.
      (tramp-file-name-handler): Do not modify `non-essential'.
      (tramp-completion-file-name-handler): Change implementation.
      (tramp-autoload-file-name-handler)
      (tramp-completion-handle-file-name-all-completions):
      Call `tramp-run-real-handler'.
      (tramp-completion-mode-p): Do not autoload.  Remove argument.
      Do not apply heuristic for completion.
      (tramp-completion-dissect-file-name): Simplify implementation.
      (tramp-handle-file-name-as-directory): Call `tramp-connectable-p'.
      
      * test/lisp/net/tramp-tests.el (tramp-test01-file-name-syntax)
      (tramp-test02-file-name-dissect)
      (tramp-test03-file-name-defaults)
      (tramp-test06-directory-file-name): Adapt to the new syntax.
      (tramp-test11-copy-file, tramp-test12-rename-file)
      (tramp--test-check-files): Deactivate temporarily tests with
      quoted file names.
      (tramp-test16-directory-files, tramp-test17-insert-directory):
      Adapt tests.
      (tramp-test24-file-name-completion): Do not check for
      completion mode.
      (tramp-test31-make-auto-save-file-name): Deactivate temporarily
      two tests.
      ed33337c
    • Eli Zaretskii's avatar
      Fix bidi paragraph direction when inserting text at newline · f591765e
      Eli Zaretskii authored
      * src/insdel.c (invalidate_buffer_caches): Invalidate the bidi
      paragraph cache when inserting immediately after a newline.
      (Bug#26083)
      f591765e
    • Tino Calancha's avatar
    • Stefan Monnier's avatar
      * lisp/emacs-lisp/cl-print.el (cl-print-compiled): New variable · 94b59f7d
      Stefan Monnier authored
      (cl-print-object) <compiled-function>: Print the docstring and
      interactive form.  Obey cl-print-compiled.
      94b59f7d
    • Noam Postavsky's avatar
      Fix indent-sexp when called from inside a string (Bug#21343) · cf670b49
      Noam Postavsky authored
      * lisp/emacs-lisp/lisp-mode.el (indent-sexp): Get initial syntax parse
      state from `syntax-ppss'.
      cf670b49
    • Noam Postavsky's avatar
      * lisp/emacs-lisp/lisp-mode.el (indent-sexp): Simplify. · 3ee3995d
      Noam Postavsky authored
      * test/lisp/emacs-lisp/lisp-mode-tests.el (indent-sexp):
      (indent-subsexp, indent-sexp-in-string): New tests.
      3ee3995d
  3. 12 Mar, 2017 10 commits
    • Stefan Monnier's avatar
      Use switch on pseudovector types; plus cleanups along the way · 1b424533
      Stefan Monnier authored
      * src/lisp.h (PSEUDOVECTOR_TYPE): New function, extracted from mark_object.
      (PSEUDOVECTOR_TYPEP): Change type of `code'.
      
      * src/alloc.c (sweep_vectors): Remove out-of-date assertion.
      (mark_object): Use PSEUDOVECTOR_TYPE.
      
      * src/data.c (Ftype_of): Use switch on pvec type.
      
      * src/print.c (print_object): Use switch on pvec type.
      
      * lisp/emacs-lisp/cl-generic.el (cl--generic-typeof-types):
      Add recently added types.
      1b424533
    • Paul Eggert's avatar
      Install update-game-score only on request · 995be66f
      Paul Eggert authored
      Most distributions do not install update-game-score properly
      due to setuid/setgid complications, so install it only when
      the installer specifies a user or group (Bug#25895).
      * .gitattributes: Remove lib-src/update-game-score.exe.manifest.
      * Makefile.in (gameuser, gamegroup, use_gamedir, PATH_GAME):
      New vars.
      (epaths-force): Use PATH_GAME.
      (uninstall): Remove snake-scores and tetris-scores only if shared.
      * configure.ac: Default --with-gameuser to 'no'.
      (UPDATE_MANIFEST): Remove.
      * etc/NEWS: Mention this.
      * lib-src/Makefile.in (UPDATE_MANIFEST): Remove.
      (use_gamedir): New macro.
      (UTILITIES): Remove update-game-score unless use_gamedir.
      (SCRIPTS): Remove $(UPDATE_MANIFEST).
      ($(DESTDIR)${archlibdir}): Install game directory program and data
      only if use_gamedir.
      * lib-src/update-game-score.exe.manifest: Remove, as
      update-game-score is no longer installed on MS-Windows.
      * lisp/play/gamegrid.el (gamegrid-add-score-with-update-game-score):
      Use auxiliary program only if setuid or setgid.
      * make-dist: Do not distribute update-game-score.exe.manifest.
      * src/callproc.c (init_callproc):
      Set Vshared_game_score_directory based on PATH_GAME, not DOS_NT.
      (syms_of_callproc): Remove unnecessary initialization of
      Vshared_game_score_directory.
      995be66f
    • Simen Heggestøyl's avatar
      Add `touch-action' to list of CSS properties · f7040f5b
      Simen Heggestøyl authored
      * lisp/textmodes/css-mode.el (css-property-alist): Add `touch-action'
      property.
      f7040f5b
    • Eli Zaretskii's avatar
      Teach etags to process ENUM_BF correctly · f0836259
      Eli Zaretskii authored
      * lib-src/etags.c (sym_type): New enumeration value st_C_enum_bf.
      (hash): Regenerated values for asso_values[] array.
      (in_word_set): Update values of TOTAL_KEYWORDS and
      MAX_HASH_VALUE.  Add "ENUM_BF" to the wordlist[] array.
      (in_enum_bf): New file-global variable.
      (consider_token): Skip ENUM_BF if not in a macro definition.
      (C_entries): Reset the in_enum_bf flag when past its closing
      parenthesis.
      
      * test/manual/etags/ETAGS.good_1:
      * test/manual/etags/ETAGS.good_2:
      * test/manual/etags/ETAGS.good_3:
      * test/manual/etags/ETAGS.good_4:
      * test/manual/etags/ETAGS.good_5:
      * test/manual/etags/ETAGS.good_6:
      * test/manual/etags/CTAGS.good: Adapt to changes in etags.
      f0836259
    • Eli Zaretskii's avatar
      ; Update expected results of etags tests. · 649fe424
      Eli Zaretskii authored
      * test/manual/etags/CTAGS.good:
      * test/manual/etags/ETAGS.good_1:
      * test/manual/etags/ETAGS.good_2:
      * test/manual/etags/ETAGS.good_3:
      * test/manual/etags/ETAGS.good_4:
      * test/manual/etags/ETAGS.good_5:
      * test/manual/etags/ETAGS.good_6: Update.
      649fe424
    • Michael Albinus's avatar
      Use path/to/file instead of path/to.file in tramp.texi · 073e5ddb
      Michael Albinus authored
      * doc/misc/tramp.texi (Configuration, File name Syntax):
      Use path/to/file instead of path/to.file.
      073e5ddb
    • Paul Eggert's avatar
      Remove some stray gnulib files · 026c2cbf
      Paul Eggert authored
      * admin/merge-gnulib: rm m4/gnulib-tool.m4 too.
      (GNULIB_MODULES): Remove unsetenv, as it is not needed and
      the --avoid=unsetenv option avoided most of it anyway.
      * lib/unsetenv.c, m4/gnulib-tool.m4, m4/setenv.m4: Remove.
      * lib/gnulib.mk: Regenerate.
      026c2cbf
    • Paul Eggert's avatar
      Merge from gnulib · cbd4708d
      Paul Eggert authored
      This incorporates:
      2017-03-11 gnulib-common.m4: avoid aclocal.m4 bloat
      * doc/misc/texinfo.tex, m4/gnulib-common.m4: Copy from gnulib.
      cbd4708d
    • Glenn Morris's avatar
      Remove trivial duplication in epg-config · 3175b535
      Glenn Morris authored
      * lisp/epg-config.el (epg-config--program-alist):
      Use epg-gpg-minimum-version.
      3175b535
    • Glenn Morris's avatar
      Small epg-find-configuration improvement · cce29d94
      Glenn Morris authored
      * lisp/epg-config.el (epg-find-configuration):
      Handle epg-gpg-program customized but not saved.  (Bug#25947)
      cce29d94
  4. 11 Mar, 2017 4 commits
  5. 10 Mar, 2017 7 commits
    • Glenn Morris's avatar
    • Glenn Morris's avatar
      Small improvement for epa-display-error (bug#24553) · b2f20aa6
      Glenn Morris authored
      * lisp/epa.el (epa-display-error): Report the actual program in use.
      b2f20aa6
    • Paul Eggert's avatar
      Tweak X toolkit code to pacify modern GCC · ec168376
      Paul Eggert authored
      * lwlib/lwlib-Xaw.c, lwlib/lwlib-Xm.c, lwlib/lwlib.c:
      Don’t include <stdlib.h>, since this code now calls emacs_abort
      rather than abort.
      * lwlib/lwlib-Xaw.c (make_dialog, xaw_generic_callback)
      (wm_delete_window):
      * lwlib/lwlib-Xm.c (make_menu_in_widget, do_call):
      * lwlib/lwlib.c (instantiate_widget_instance, lw_make_widget):
      * lwlib/xlwmenu.c (abort_gracefully, draw_separator)
      (separator_height, XlwMenuInitialize):
      Use emacs_abort, not abort.  Without this change, some calls
      to ‘abort’ were invalid, as stdlib.h was not always included.
      * src/widget.c (resources, emacsFrameClassRec):
      * src/xfns.c (x_window) [USE_X_TOOLKIT]:
      * src/xmenu.c (create_and_show_popup_menu) [USE_X_TOOLKIT]:
      * src/xterm.c (emacs_options) [USE_X_TOOLKIT}:
      (x_term_init) [USE_X_TOOLKIT]:
      Cast string constants to char * to pacify --enable-gcc-warnings.
      ec168376
    • Michael Albinus's avatar
    • Michael Albinus's avatar
      Adapt tramp-tests.el · 7e434ed2
      Michael Albinus authored
      * test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name)
      (tramp-test24-file-name-completion): Call
      `tramp-completion-mode-p' with argument.
      7e434ed2
    • Thien-Thi Nguyen's avatar
      [doc] Replace bindat example: s/fortune cookie/rfc868 payload/ · ae6b2b89
      Thien-Thi Nguyen authored
      * doc/lispref/processes.texi (Bindat Examples):
      Mention two examples in intro blurb; rewrite first example.
      ae6b2b89
    • Paul Eggert's avatar
      Simplify checks for xdg-open and xdg-email · 26848af9
      Paul Eggert authored
      browse-url's xdg-open detection was too picky on some GNU/Linux
      desktops; see Bug#25778.  Simplify the code by assuming xdg-open works
      if it is executable, as nowadays this is more likely to be correct than
      trying to use heuristics from a few years ago.  Don't test for nohup: it
      is ineffective nowadays, as xdg-open's child uses the default action for
      SIGHUP even if xdg-open's invoker ignores SIGHUP.  While we're at it,
      allow for Wayland here, as "emacs -nw" might be running in a non-X
      Wayland terminal.
      * lisp/mail/emacsbug.el (report-emacs-bug-can-use-xdg-email):
      * lisp/net/browse-url.el (browse-url-can-use-xdg-open):
      Simplify to a test for DISPLAY and whether the helper program is
      executable.  Allow WAYLAND_DISPLAY as an option.
      26848af9
  6. 09 Mar, 2017 2 commits
    • Vibhav Pant's avatar
      Byte compile cond clauses without any bodies correctly. · 09207134
      Vibhav Pant authored
      * lisp/emacs-lisp/bytecomp.el (byte-compile-cond-jump-table): When a
      cond clause has no body, push t on to the stack.
      09207134
    • Michael Albinus's avatar
      Fix bug#23006 · 37b88d7b
      Michael Albinus authored
      * lisp/minibuffer.el (completion--nth-completion):
      Let-bind `non-essential'.
      
      * lisp/net/tramp.el (tramp-completion-mode): Fix docstring.
      (tramp-completion-mode-p): Optional parameter VEC.  Replace
      check for `last-input-event' by analysing VEC argument.
      (tramp-error-with-buffer, tramp-file-name-handler)
      (tramp-connectable-p, tramp-handle-file-name-as-directory):
      * lisp/net/tramp-sh.el (tramp-maybe-open-connection): Use it.
      37b88d7b