1. 04 Apr, 2018 4 commits
    • Glenn Morris's avatar
      Merge from origin/emacs-26 · 2f779d8c
      Glenn Morris authored
      3109d2bb (origin/emacs-26) ; * lisp/ldefs-boot.el: Update.
      86825c42 * etc/NEWS: Remove temporary markup.
      737d0a25 * Update etc/AUTHORS
      fbd03bad * ChangeLog.3: Update
      56794ac6 Fix Bug#31022
      a231c33e Update "Calendrical Calculations" cites
      1527235b ; * doc/lispref/compile.texi (Compilation Functions): Fix wor...
      b07decdf ; * doc/lispref/compile.texi (Compilation Functions): Fix typo
      a64c11a3 Fix term.el rendering following a window resize (Bug#30544)
      1e6f09aa * files.el (auto-save-visited-mode): Don't prompt for filenames.
      eb8b13fc ; * etc/NEWS: Improve the entry about pinentry.el removal.
      52501ec3 Quote a few backticks in docstrings.
      
      Conflicts:
      	etc/NEWS
      	lisp/ldefs-boot.el
      2f779d8c
    • Martin Rudalics's avatar
    • Stefan Monnier's avatar
      * lisp/vc/emerge.el: Use lexical-binding · fbd025a6
      Stefan Monnier authored
      Replace all `(lambda ...) with closures.  Use inhibit-read-only.
      (emerge-mode): Use define-minor-mode.
      (emerge-setup, emerge-setup-with-ancestor):
      Don't use 'run-hooks' on local var.
      (emerge-files, emerge-files-with-ancestor):
      Don't use 'add-hook' on local var.
      (emerge-convert-diffs-to-markers): Remove unused var 'B-point-min'.
      Simplify 'offset'.
      (emerge--current-beg, emerge--current-end): New macros.
      (emerge-select-version): Pass 'diff-vector' to the function it calls.
      Change all callers to use it instead of dyn-bound vars.
      fbd025a6
    • Paul Eggert's avatar
      Pacify GCC when --enable-profiling · 9b0e8a4c
      Paul Eggert authored
      * src/conf_post.h (PROFILING): Undef if not on a platform that
      supports it.  Simplify uses accordingly.
      * src/emacs.c (etext) [PROFILING]:
      Declare at top level to avoid GCC warning.
      9b0e8a4c
  2. 03 Apr, 2018 13 commits
  3. 02 Apr, 2018 12 commits
  4. 01 Apr, 2018 11 commits