1. 15 Nov, 2015 4 commits
  2. 14 Nov, 2015 8 commits
    • David Engster's avatar
      gitmerge: Fix git log command · dcd5877a
      David Engster authored
      * admin/gitmerge.el (gitmerge-missing): Use '--left-only' since we
      only want commits from the branch that is to be merged.
      (gitmerge-setup-log-buffer): Use the same symmetric range as in
      `gitmerge-missing'.
      dcd5877a
    • David Engster's avatar
      gitmerge: Try to detect cherry-picks · 2ac79ae9
      David Engster authored
      * admin/gitmerge.el (gitmerge-default-branch): Change to
      origin/emacs-25.
      (gitmerge-missing): Use symmetric difference ('...') between
      branch and master so that cherry-picks can be detected.
      2ac79ae9
    • Eli Zaretskii's avatar
      Increment Emacs version on master branch · 5f7a2a90
      Eli Zaretskii authored
      * lisp/cus-edit.el (customize-changed-options-previous-release):
      Increase previous version to 24.5.
      
      * configure.ac:
      * msdos/sed2v2.inp: Bump version to 25.1.50.
      5f7a2a90
    • Xue Fuqiao's avatar
      Mention CONTRIBUTE in README · ed2e7e20
      Xue Fuqiao authored
      Mention CONTRIBUTE in README, since it was moved from etc/ to root.
      * etc/TODO: Remove the reference to `etc/CONTRIBUTE'.
      * README: Mention CONTRIBUTE.
      ed2e7e20
    • Wilson Snyder's avatar
      Update verilog-mode.el to 2015-11-09-b121d60-vpo. · 9e00a029
      Wilson Snyder authored
      * verilog-mode.el (verilog-auto, verilog-delete-auto)
      (verilog-modi-cache-results, verilog-save-buffer-state)
      (verilog-save-font-no-change-functions): When internally suppressing change
      functions, use `inhibit-modification-hooks' and call
      `after-change-funtions' to more nicely work with user hooks.  Reported by
      Stefan Monnier.
      
      (verilog-auto, verilog-delete-auto, verilog-delete-auto-buffer):
      Create `verilog-delete-auto-buffer' to avoid double-calling
      fontification hooks.
      
      (verilog-restore-buffer-modified-p, verilog-auto)
      (verilog-save-buffer-state): Prefer restore-buffer-modified-p over
      set-buffer-modified-p. Reported by Stefan Monnier.
      
      (verilog-diff-auto, verilog-diff-buffers-p)
      (verilog-diff-ignore-regexp): Add `verilog-diff-ignore-regexp'.
      
      (verilog-auto-inst-port, verilog-read-sub-decls-expr): Fix
      AUTOINST with unpacked dimensional parameters, bug981. Reported by
      by Amol Nagapurkar.
      
      (verilog-read-decls, verilog-read-sub-decls-line): Avoid unneeded
      properties inside internal structures. No functional change
      intended.
      9e00a029
    • Dmitry Gutov's avatar
      ; Fix warnings · 138ad3d9
      Dmitry Gutov authored
      * lisp/vc/diff-mode.el (diff-kill-applied-hunks):
      Fix unused variable warnings.
      138ad3d9
    • Dmitry Gutov's avatar
      7126e9a4
    • Dmitry Gutov's avatar
      Use generic dispatch for xref backends · 246d6605
      Dmitry Gutov authored
      * lisp/progmodes/xref.el (xref-backend-functions):
      New variable.
      (xref-find-function): Remove.
      (xref-find-backend)
      (xref--etags-backend): New functions.
      (xref-identifier-at-point-function)
      (xref-identifier-completion-table-function): Remove.
      (xref-backend-definitions, xref-backend-references)
      (xref-backend-apropos, xref-backend-identifier-at-point)
      (xref-backend-identifier-completion-table):
      New generic functions.
      
      * lisp/progmodes/elisp-mode.el (emacs-lisp-mode): Add
      `elisp--xref-backend' to the beginning of
      `xref-backend-functions', locally.  Delete references to
      removed functions and vars.
      (elisp-xref-find): Remove.
      (elisp--xref-backend): New function.
      (elisp--xref-find-references, elisp--xref-find-apropos)
      (elisp--xref-identifier-completion-table):
      Turn into appropriately named generic methods.
      
      * lisp/progmodes/etags.el (etags-xref-find): Remove.
      (xref-backend-identifier-completion-table)
      (xref-backend-references, xref-backend-definitions)
      (xref-backend-apropos): New generic methods.
      246d6605
  3. 13 Nov, 2015 19 commits
    • Juri Linkov's avatar
      Support rectangular regions for more commands · 31f6e939
      Juri Linkov authored
      * lisp/simple.el (region-extract-function): Handle the arg value ‘bounds’.
      (region-insert-function): New function.
      (shell-command-on-region): Add arg ‘region-noncontiguous-p’.
      If non-nil, operate on multiple chunks.
      (region-noncontiguous-p): New function.
      
      * lisp/rect.el: Add function rectangle--insert-region
      around region-insert-function.
      (extract-rectangle-bounds): New function.
      (rectangle--extract-region): Handle the arg value ‘bounds’.
      (rectangle--insert-region): New function.
      
      * lisp/emulation/cua-rect.el: Add function cua--insert-rectangle
      around region-insert-function.
      (cua--extract-rectangle-bounds): New function.
      (cua--rectangle-region-extract): Handle the arg value ‘bounds’.
      
      * lisp/replace.el (query-replace, query-replace-regexp): Add arg
      ‘region-noncontiguous-p’.  Use ‘use-region-p’.
      (query-replace-regexp-eval, map-query-replace-regexp)
      (replace-string, replace-regexp): Use ‘use-region-p’.
      (keep-lines, flush-lines, how-many): Use ‘use-region-p’.
      (perform-replace): Add arg ‘region-noncontiguous-p’.
      If non-nil, operate on multiple chunks.
      
      * src/casefiddle.c (Fdowncase_region): Add arg ‘region-noncontiguous-p’.
      If non-nil, operate on multiple chunks. (Bug#19829)
      31f6e939
    • Dmitry Gutov's avatar
      Handle multiple matches on the same line; add highlighting · f103a277
      Dmitry Gutov authored
      * lisp/progmodes/xref.el (xref-location-marker): Interpret the
      column value in characters.
      (xref--collect-matches): Rename from `xref--collect-match'.
      Search for all matches in the hit line.  Add `highlight' face to
      the matched region in the summary.  Update both callers.
      f103a277
    • Dmitry Gutov's avatar
      Replace xref-match-bounds with xref-match-length · fe973fc2
      Dmitry Gutov authored
      Relying on xref-location-marker to point to the beginning of the match
      
      * lisp/progmodes/xref.el (xref-match-bounds): Remove.
      (xref-match-length): Add.
      (xref-make-match): Change the arguments.
      (xref--match-buffer-bounds): Remove.
      (xref-match-item): Store length, instead of end-column.
      (xref-pulse-momentarily)
      (xref--collect-match)
      (xref--query-replace-1): Update accordingly.
      (xref-query-replace): Ditto.  And check that the search results
      are up-to-date.
      fe973fc2
    • Paul Eggert's avatar
      Merge from gnulib · 92a50102
      Paul Eggert authored
      This incorporates:
      2015-11-13 xalloc-oversized: improve performance with GCC 5
      * lib/xalloc-oversized.h: Copy from gnulib.
      92a50102
    • Paul Eggert's avatar
      Spruce up ftfont.c memory allocation · 04ac097f
      Paul Eggert authored
      * src/ftfont.c (setup_otf_gstring):
      Avoid O(N**2) behavior when reallocating.
      (ftfont_shape_by_flt): Prefer xpalloc to xrealloc when
      reallocating buffers; this simplifies the code.  Do not trust
      mflt_run to leave the output areas unchanged on failure, as
      this isn’t part of its interface spec.
      04ac097f
    • Paul Eggert's avatar
      Port recent XCB changes to 64-bit ‘long int’ · 4c4b5205
      Paul Eggert authored
      For historical reasons, libX11 represents 32-bit values like Atoms as
      ‘long int’ even on platforms where ‘long int’ is 64 bits.  XCB doesn’t
      do that, so adapt the recent XCB code to behave properly on 64-bit
      platforms.  Also, fix what appears to be a bug in the interpretation
      of xcb_get_property_value_length, at least on my Fedora platform
      which is running libxcb-1.11-5.fc21.
      * src/xfns.c (x_real_pos_and_offsets):
      * src/xterm.c (get_current_wm_state):
      xcb_get_property_value_length returns a byte count, not a word count.
      For 32-bit quantities, xcb_get_property_value returns a vector
      of 32-bit words, not of (possibly 64-bit) long int.
      4c4b5205
    • Paul Eggert's avatar
      4f0ce9c8
    • Eli Zaretskii's avatar
      Remove support for ':timeout' from w32 tray notifications · 695a6f93
      Eli Zaretskii authored
      * src/w32fns.c (Fw32_notification_notify): Delete the code that
      supports ':timeout'.
      (syms_of_w32fns): Don't DEFSYM ':timeout'.  This avoids clashes
      with dbusbind.c when D-Bus is compiled in.
      
      * doc/lispref/os.texi (Desktop Notifications): Don't mention
      ':timeout'.
      695a6f93
    • Juanma Barranquero's avatar
      * test/automated/simple-test.el: Add test for bug#20698 (bug#21885) · a731c2f1
      Juanma Barranquero authored
      (simple-test--transpositions): New macro.
      (simple-transpose-subr): New test.
      a731c2f1
    • Juanma Barranquero's avatar
    • Juanma Barranquero's avatar
      * src/undo.c: Small fixes for previous change · 66b9f7bd
      Juanma Barranquero authored
      (run_undoable_change): Mark void argument list.
      (record_property_change): Remove unused variable `boundary'.
      66b9f7bd
    • Eli Zaretskii's avatar
      Add a few more variables to redisplay--variables · 2fac30eb
      Eli Zaretskii authored
      * lisp/frame.el (redisplay--variables): Add bidi-paragraph-direction
      and bidi-display-reordering to the list.
      2fac30eb
    • Eli Zaretskii's avatar
    • Eli Barzilay's avatar
      Fix point positioning after transposing with negative arg · e221d32d
      Eli Barzilay authored
      * lisp/simple.el (transpose-subr): When invoked with a negative
      argument, move point to after the transposed text, like we do
      when invoked with a positive argument.  (Bug#21885)
      e221d32d
    • Eli Zaretskii's avatar
      Fix last change in shr.el · 35f5afbc
      Eli Zaretskii authored
      * lisp/net/shr.el (shr--have-one-fringe-p): Rename from
      have-fringes-p.  All callers changed.  Doc fix.  (Bug#21895)
      35f5afbc
    • Eli Zaretskii's avatar
      Fix last change · 508e77b7
      Eli Zaretskii authored
      * src/w32fns.c (syms_of_w32fns) [WINDOWSNT && !HAVE_DBUS]:
      Don't DEFSYM tray notification symbols if D-Bus is being used.
      508e77b7
    • Eli Zaretskii's avatar
      Another fix for MinGW64 and Cygwin builds due to notifications · d60ed3f3
      Eli Zaretskii authored
      * src/w32fns.c: Ifdef away tray notification code if D-Bus is
      being compiled into Emacs.
      (syms_of_w32fns) [WINDOWSNT && !HAVE_DBUS]: Don't defsubr
      Sw32_notification_notify and Sw32_notification_close if the code
      is not compiled.  Reported by Andy Moreton <andrewjmoreton@gmail.com>.
      d60ed3f3
    • YAMAMOTO Mitsuharu's avatar
      Remove intern calls and XXX comments from Fx_export_frames · 805a39bc
      YAMAMOTO Mitsuharu authored
      * src/xfns.c (Fx_export_frames): Use Qpdf, Qpng, Qpostscript, and
      Qsvg instead of intern calls.  Use "postscript" instead of "ps"
      for consistency with image types.  Remove XXX comments.
      (syms_of_xfns) <Qpdf>: DEFSYM it.
      805a39bc
    • Eric Hanchrow's avatar
      shr: don't invoke unbound function (Bug#21895) · 9463abf4
      Eric Hanchrow authored
      * lisp/net/shr.el (have-fringes-p): New function.
        (shr-insert-document, shr-fill-text): Use it.
      9463abf4
  4. 12 Nov, 2015 9 commits
    • Juanma Barranquero's avatar
      * test/automated/keymaps-test.el: Fix test to make it repeatable · 6e5186e8
      Juanma Barranquero authored
      (keymap-store_in_keymap-FASTINT-on-nonchars): Reset Buffer-menu-mode-map
      entry to its initial value to make the test repeatable in interactive
      sessions (assuming it doesn't fail and crashes Emacs, of course).
      6e5186e8
    • Artur Malabarba's avatar
    • Phillip Lord's avatar
      : Tests for undo-auto functionality. · 39dbd1cd
      Phillip Lord authored
      39dbd1cd
    • Phillip Lord's avatar
      ; Merge branch 'fix/no-undo-boundary-on-secondary-buffer-change' · 20aa42e8
      Phillip Lord authored
      Conflicts:
      	src/cmds.c
      	src/keyboard.c
      20aa42e8
    • Phillip Lord's avatar
      The heuristic that Emacs uses to add an `undo-boundary' has been · 44dfa86b
      Phillip Lord authored
      reworked, as it interacts poorly with functions on `post-command-hook'
      or `after-change-functions'.
      
      * lisp/simple.el: New section added.
      * src/cmds.c (remove_excessive_undo_boundaries): Now in lisp.
      (self_insert_command): Calls simple.el to amalgamate.
      (delete_char): Calls simple.el to amalgamate.
      * src/keyboard.c (last_undo_boundary): Removed.
      * src/undo.c (run_undoable_change): New function.
      44dfa86b
    • Juri Linkov's avatar
      Bind [?\S-\ ] to previous line command in Dired-like modes. · d2f73db5
      Juri Linkov authored
      * lisp/arc-mode.el (archive-mode-map):
      * lisp/dired.el (dired-mode-map):
      * lisp/proced.el (proced-mode-map):
      * lisp/vc/vc-dir.el (vc-dir-mode-map):
      Bind [?\S-\ ] to previous line command.
      (Bug#20790)
      d2f73db5
    • Eli Zaretskii's avatar
      Fix the MinGW64 and Cygwin-w32 builds · c1bc6e5d
      Eli Zaretskii authored
      * src/w32fns.c (MYNOTIFYICONDATAW_V1_SIZE)
      (MYNOTIFYICONDATAW_V2_SIZE, MYNOTIFYICONDATAW_V3_SIZE): Define and
      use instead of the corresponding NOTIFYICONDATAW_Vn_SIZE macros,
      which cause trouble with MinGW42 headers.  Ifdef away tray
      notifications code for Cygwin.  Reported by Andy Moreton
      <andrewjmoreton@gmail.com>.
      c1bc6e5d
    • Simen Heggestøyl's avatar
      Enable sorting of JSON object keys when encoding · 1e363a8e
      Simen Heggestøyl authored
      * lisp/json.el (json-encoding-object-sort-predicate): New variable for
      specifying a sorting predicate for JSON objects during encoding.
      (json--plist-to-alist): New utility function.
      (json-encode-hash-table): Re-use `json-encode-alist' when object keys
      are to be sorted.
      (json-encode-alist): Sort output by
      `json-encoding-object-sort-predicate, when set.
      (json-encode-plist): Re-use `json-encode-alist' when object keys are
      to be sorted.
      (json-pretty-print-buffer-ordered): New command to pretty print the
      buffer with object keys sorted alphabetically.
      (json-pretty-print-ordered): New command to pretty print the region with
      object keys sorted alphabetically.
      
      * test/automated/json-tests.el (test-json-plist-to-alist)
      (test-json-encode-plist, test-json-encode-hash-table)
      (test-json-encode-alist-with-sort-predicate)
      (test-json-encode-plist-with-sort-predicate): New tests.
      
      * etc/NEWS: Add an entry for the new commands.
      1e363a8e
    • Juanma Barranquero's avatar
      9dd7da99