1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-28 07:50:48 -08:00
Commit graph

130436 commits

Author SHA1 Message Date
Ricardo Wurmus
623deaf406 xwidget: Pass JavaScript return value to optional callback procedure
* lisp/xwidget.el (xwidget-webkit-execute-script): Accept optional
callback argument.
(xwidget-webkit-callback): Handle "javascript-callback" event type.
* src/xwidget.c (xwidget-webkit-execute-script): Accept optional
argument FUN, a Lisp procedure to execute on the JavaScript return
value.
(store_xwidget_js_callback_event, webkit_javascript_finished_cb,
webkit_js_to_lisp): New procedures.
2016-10-25 23:07:13 -07:00
Ricardo Wurmus
d781662873 xwidget: Use WebKit2 API
* configure.ac: Check for webkit2gtk-4.0.
* src/xwidget.c: Adjust to use WebKit2 API.
* lisp/xwidget.el (xwidget-webkit-callback): Adjust matches for
`xwidget-event-type'.
2016-10-25 23:07:13 -07:00
Noam Postavsky
43986d16fb Inhibit buffer relocation during regex searches
* src/search.c (looking_at_1, fast_looking_at, search_buffer): Prevent
relocation of buffer contents during calls to re_search_2.  This ensures
the pointers into buffer text won't be invalidated by
r_alloc_sbrk (called from malloc with configurations where
REL_ALLOC=yes).
2016-10-25 20:15:33 -04:00
Noam Postavsky
fee4cef7d7 Revert fixes to allocation of regex matching
The fix was not complete, and completing it was proving too complicated.

- Revert "* src/regex.c (re_search_2): Make new code safe for
          -Wjump-misses-init."
  This reverts commit c2a17924a5.
- Revert "Port to GCC 6.2.1 + --enable-gcc-warnings"
  This reverts commit f6134bbda2.
- Revert "Fix handling of allocation in regex matching"
  This reverts commit ad66b3fadb.
- Revert "Fix handling of buffer relocation in regex.c functions"
  This reverts commit ee04aedc72.
2016-10-25 20:15:33 -04:00
Paul Eggert
1ea669d6f0 Merge from origin/emacs-25
4c3f738 Comment for bug#24793
2016-10-25 12:50:31 -07:00
Paul Eggert
b0eecfca56 ; Merge from origin/emacs-25
The following commit was skipped:

32827b3 Default REL_ALLOC to 'no'
2016-10-25 12:50:31 -07:00
Paul Eggert
f8eecb1c6c Merge from origin/emacs-25
96ac0c3 Yet another fix for using pointers into buffer text
1047496 Another fix for using pointer to buffer text
3121992 Fix Bug#24478
2016-10-25 12:50:31 -07:00
Paul Eggert
43645b4dc4 ; Merge from origin/emacs-25
The following commit was skipped:

7bb5c4f Port --enable-gcc-warnings to bleeding-edge glibc
2016-10-25 12:50:30 -07:00
Paul Eggert
a37820aef9 Merge from origin/emacs-25
ee04aed Fix handling of buffer relocation in regex.c functions
71ca4f6 Avoid relocating buffers while libxml2 reads its text
1b3fc8a ; Remove redundant code in gmalloc.c
9afea93 Attempt to catch reads from a buffer that is relocated
2016-10-25 12:50:30 -07:00
Paul Eggert
630f535ad6 ; Merge from origin/emacs-25
The following commits were skipped:

b8e8e15 Revert "* lisp/simple.el (process-menu-mode, list-processes--...
d784e75 Revert "* lisp/ibuf-ext.el (ibuffer-do-shell-command-file):"
1dd7b54 Revert "* lisp/ibuffer.el (ibuffer): Improve 'other-window' c...
2016-10-25 12:50:29 -07:00
Eli Zaretskii
4c3f7387df Comment for bug#24793
* lisp/info.el (Info-mode-font-lock-keywords): Add a comment
explaining why `..' quoting is not fontified using the
'Info-quoted' face.  (Bug#24793)
2016-10-25 22:33:14 +03:00
Nicolas Petton
eca10c1e68
Minor fix in the documentation of seq-random-elt
* doc/lispref/sequences.texi (Sequence Functions): Remove false
  sentence.
2016-10-25 21:28:36 +02:00
Paul Eggert
32827b374d Default REL_ALLOC to 'no'
This should make ralloc-related bugs less likely on GNU/Linux
systems with bleeding-edge glibc.  See the email thread containing:
http://lists.gnu.org/archive/html/emacs-devel/2016-10/msg00801.html
Do not merge to master.
* configure.ac (REL_ALLOC): Default to 'no' on all platforms, not
merely on platforms with Doug Lea malloc.  Although bleeding-edge
glibc no longer exports __malloc_initialize_hook and so longer
passes the configure-time test for Doug Lea malloc, ralloc tickles
longstanding bugs like Bug#24358 and Bug#24764 and Emacs is likely
to be more reliable without it.  This patch is not needed on
master, which uses hybrid malloc in this situation.
2016-10-25 12:20:26 -07:00
Eli Zaretskii
8cdbc50118 Minor copyedits in documentation of 'seq-random-elt'
* doc/lispref/sequences.texi (Sequence Functions): Fix markup in
last change.  Use 2 spaces between sentences.
2016-10-25 21:56:16 +03:00
Nicolas Petton
b4f09b92bc * lisp/emacs-lisp/seq.el (seq-random-elt): Fix docstring. 2016-10-25 17:07:07 +02:00
Philipp Stephani
4722db6c96 ; Add missing `require' 2016-10-25 13:29:52 +02:00
Damien Cassou
bd22beb6e4 Add seq-random-elt to seq.el
* lisp/emacs-lisp/seq.el (seq-random-elt): Add function to return a
  random element from it's sequence parameter.

* test/lisp/emacs-lisp/seq-tests.el (test-seq-random-elt-take-all
  test-seq-random-elt-return-nil): Test the new function

* doc/lispref/sequences.texi: Document the new function
2016-10-25 12:32:57 +02:00
Eli Zaretskii
96ac0c3ebc Yet another fix for using pointers into buffer text
* src/search.c (boyer_moore): Update pointers to buffer text
after call to set_search_regs.  (Bug#24358)
2016-10-24 21:37:20 +03:00
Ken Brown
26ccd19269 * configure.ac: Stop using mmap for buffers on Cygwin. 2016-10-24 12:41:07 -04:00
Eli Zaretskii
1047496722 Another fix for using pointer to buffer text
* src/search.c (Freplace_match): Move the call to BYTE_POS_ADDR
after the call to xpalloc, to avoid the danger of buffer text
relocation after its address was taken.  (Bug#24358)
2016-10-24 16:59:34 +03:00
Michael Albinus
31219927a9 Fix Bug#24478
* lisp/net/tramp-sh.el (tramp-histfile-override): Change default value
to "~/.tramp_history".
(tramp-open-shell): Check proper HISTFILE setting.
(tramp-maybe-open-connection): Cleanup also for errors.  (Bug#24478)
2016-10-24 15:04:25 +02:00
Nicolas Petton
524a05ac78
* lisp/emacs-lisp/seq.el (seq-let): Fix debug spec (Bug#24738) 2016-10-24 13:15:05 +02:00
Karl Chen
7cc8c4b35b Don't prompt user when killing Flymake processes
* lisp/progmodes/flymake.el (flymake-start-syntax-check-process):
Don’t prompt the user when killing Flymake processes.

* doc/misc/flymake.texi (Starting the syntax check process):
Document new behavior.
2016-10-24 11:34:04 +02:00
Paul Eggert
7bb5c4f206 Port --enable-gcc-warnings to bleeding-edge glibc
Bleeding-edge glibc sets emacs_cv_var_doug_lea_malloc to 'no'.
Do not merge to master.
* configure.ac: Check for valloc decl when compiling gmalloc.c.
* src/gmalloc.c (emacs_abort) [emacs]: Adjust decl to match
what is in lisp.h.  Remove duplicate decl.
(aligned_alloc): #undef before defining.
(aligned_alloc, memalign) [!MSDOS]: Declare.
(valloc) [HAVE_DECL_VALLOC]: Remove duplicate decl.
2016-10-23 21:55:07 -07:00
Eli Zaretskii
ee04aedc72 Fix handling of buffer relocation in regex.c functions
* src/search.c (search_buffer): Updated the base pointer to buffer
text after the call to re_search_2.  (Bug#24358)
2016-10-23 22:09:43 +03:00
Eli Zaretskii
71ca4f6a43 Avoid relocating buffers while libxml2 reads its text
* src/xml.c (parse_region) [REL_ALLOC]: Freeze the ralloc arena
while libxml2 reads the current buffer's text.  (Bug#24764)
2016-10-23 19:52:56 +03:00
Eli Zaretskii
1b3fc8ab49 ; Remove redundant code in gmalloc.c
* src/gmalloc.c [WINDOWSNT]: Remove MS-Windows only inclusion of
w32heap.h, as the MS-Windows build no longer uses gmalloc.c.
2016-10-23 18:05:48 +03:00
Eli Zaretskii
9afea93ed5 Attempt to catch reads from a buffer that is relocated
* src/xml.c (parse_region): Add assertion to ensure buffer text is
not relocated while libxml2 is reading it.  (Bug#24764)
2016-10-23 16:54:00 +03:00
Eli Zaretskii
b8e8e15288 Revert "* lisp/simple.el (process-menu-mode, list-processes--refresh):"
This reverts commit a4285bcb11.
Do not merge to master!
2016-10-23 16:04:20 +03:00
Eli Zaretskii
d784e75776 Revert "* lisp/ibuf-ext.el (ibuffer-do-shell-command-file):"
This reverts commit b0c447e466.
Do not merge to master!
2016-10-23 16:03:25 +03:00
Eli Zaretskii
1dd7b54a7e Revert "* lisp/ibuffer.el (ibuffer): Improve 'other-window' case. (Bug#23617)"
This reverts commit cf3c19b029.
Do not merge to master!
2016-10-23 16:02:11 +03:00
Michael Albinus
8ca70e402e ; Apply whitespace conventions of Tramp upstream 2016-10-23 13:28:33 +02:00
Paul Eggert
a0d1e4c662 * src/regex.c (re_search_2): Use UNINIT, not IF_LINT.
This finishes the merge of the recent emacs-25 regex changes into
master.
2016-10-23 02:58:31 -07:00
Paul Eggert
394bdb8f23 Merge from origin/emacs-25
50fa7d6 ;* src/w32heap.c: Fix typo and wording of the comments.
6f1325e electric-quote mode no longer worries about coding
c2a1792 * src/regex.c (re_search_2): Make new code safe for -Wjump-mi...
f6134bb Port to GCC 6.2.1 + --enable-gcc-warnings
b2ba630 Explain how to debug emacsclient lisp errors
9da53e2 Let describe-function work for lambda again
5c2da93 Fix kill-line's docstring
ad66b3f Fix handling of allocation in regex matching
5a26c9b * lisp/electric.el (electric-quote-mode): Improve doc (Bug#24...
3877c91 vc-region-history: Search just on lines intersecting the region
8988327 Fix documentation of 'alist-get'
b6998ea * src/regex.h (re_match_object): Improve commentary.

# Conflicts:
#	etc/NEWS
#	lisp/help-fns.el
2016-10-23 02:50:48 -07:00
Paul Eggert
46288dd632 ; Merge from origin/emacs-25
The following commit was skipped:

dfd0476 Fix cursor at bottom left of rectangle (bug#24364)
2016-10-23 02:48:50 -07:00
Paul Eggert
6df147c61a Merge from origin/emacs-25
8ad0d7d ; Fix quoting in etc/NEWS
6b9dee1 Change Tramp version to "2.2.13.25.2"
62f2684 * lisp/emacs-lisp/autoload.el (update-directory-autoloads): F...
b2f32e4 Don't scan compiled module files for autoloads
9a758b4 Fix Bug#24698
baa8ba4 * lisp/subr.el (start-process): Doc fix.  (Bug#24693)
e535ca4 Fix display of vc-dir CVS file statuses in subdirectories
12da149 Update URL of MS-Windows optional DLLs
2331056 Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac...
a4285bc * lisp/simple.el (process-menu-mode, list-processes--refresh)...
b0c447e * lisp/ibuf-ext.el (ibuffer-do-shell-command-file): Fix non-f...
cf3c19b * lisp/ibuffer.el (ibuffer): Improve 'other-window' case.  (B...

# Conflicts:
#	doc/misc/trampver.texi
#	etc/NEWS
#	lisp/net/tramp-sh.el
#	lisp/net/trampver.el
2016-10-23 02:48:50 -07:00
Paul Eggert
e892e11586 ; Merge from origin/emacs-25
The following commits were skipped:

d70ed8a Fix time-related data types in 2 editfns.c functions
99892ee Port to Ubuntu 16.10, which needs gcc -nopie
2016-10-23 02:43:18 -07:00
Paul Eggert
6129cd03e2 Merge from origin/emacs-25
b73f466 * lisp/cus-start.el (exec-path): Handle nil elements.  (Bug#2...
55ebb70 Catch the imenu-unavailable error in sh-mode completion table
993acb5 ; Minor fix for last change in characters.el
30c4bb5 More char-width fixes
4eb4463 Fix char-width-table values for some Emoji
528997d Keep point when switching from and to *terminal* buffer
2130005 * INSTALL: Use correct Emacs release number 25.
10835b1 Avoid crashes due to objects read with the #n=object form
4de671d Improve doc string of 'completion-at-point-functions'
ceb46f0 Fix crash in evaluating functions
d8374c4 * src/filelock.c (current_lock_owner): Update comment.
2016-10-23 02:43:17 -07:00
Paul Eggert
16d126d755 ; Merge from origin/emacs-25
The following commits were skipped:

eb17d6f Port --enable-gcc-warnings to GCC 6.2.1
40c426a Work around Samba bug with ':' in symlink contents
2016-10-23 02:43:17 -07:00
Paul Eggert
f39141b786 Merge from origin/emacs-25
2deb20c Port last_marked change to full-program optimizers
27eb668 Adapt GDB scripts to '--enable-check-lisp-object-type' builds
dac64e3 Avoid optimizing out the last_marked[] array
2016-10-23 02:43:16 -07:00
Eli Zaretskii
50fa7d64d3 ;* src/w32heap.c: Fix typo and wording of the comments. 2016-10-23 12:14:05 +03:00
Paul Eggert
6f1325ed92 electric-quote mode no longer worries about coding
* doc/emacs/text.texi (Quotation Marks), etc/NEWS: Document this.
* lisp/electric.el (electric--insertable-p): Remove.
All uses removed (Bug#24759).
2016-10-23 01:14:57 -07:00
Paul Eggert
c2a17924a5 * src/regex.c (re_search_2): Make new code safe for -Wjump-misses-init. 2016-10-23 01:01:24 -07:00
Paul Eggert
f6134bbda2 Port to GCC 6.2.1 + --enable-gcc-warnings
* src/regex.c (ENSURE_FAIL_STACK, re_search_2):
Redo recent regex changes to avoid complaints from GCC 6.2.1 when
Emacs is configured with --enable-gcc-warnings.  Also, work around
GCC bug 78081, which was uncovered by this new code.
2016-10-22 21:14:15 -07:00
Noam Postavsky
241ae7a151 Avoid infinite hscrolling in redisplay
* src/xdisp.c (redisplay_internal): Add a counter to avoid horizontal
scrolling (e.g., caused by pre-redisplay-functions) triggering infinite
redisplay (Bug #24633).
2016-10-22 16:29:52 -04:00
Noam Postavsky
b2ba630739 Explain how to debug emacsclient lisp errors
* doc/lispref/debugging.texi (Error Debugging): Mention that
debug-on-signal is useful for getting backtraces from
emacsclient (Bug#24616).
2016-10-22 12:06:29 -04:00
Michael Albinus
abd1642e1e Fix error codes in Tramp
* lisp/net/tramp-compat.el (tramp-compat-user-error): New defsubst,
taken from tramp.el.
(tramp-file-missing): New defconst.

* lisp/net/tramp.el (tramp-user-error): Remove it.
(tramp-check-proper-method-and-host)
(tramp-dissect-file-name, tramp-debug-message)
(tramp-handle-shell-command):
* lisp/net/tramp-adb.el (tramp-adb-handle-shell-command):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler):
Use `tramp-compat-user-error'.

* lisp/net/tramp.el (tramp-handle-insert-file-contents)
(tramp-handle-load):
* lisp/net/tramp-adb.el (tramp-adb-handle-file-local-copy):
* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-file-local-copy)
* lisp/net/tramp-sh.el (tramp-sh-handle-file-local-copy):
* lisp/net/tramp-smb.el (tramp-smb-handle-file-local-copy):
Use `tramp-file-missing'.  (Bug#24714)

* lisp/net/tramp-sh.el (tramp-sh-handle-add-name-to-file):
* lisp/net/tramp-smb.el (tramp-smb-handle-make-symbolic-link):
Use `file-already-exists'.
2016-10-22 13:54:56 +02:00
Jorgen Schaefer
d4a32c4d59 Autoload all commands from misc.el
Only two of the commands there were autoloaded, one of which is an
easter egg.
* lisp/miscl.el (copy-from-above-command):
* lisp/miscl.el (zap-up-to-char):
* lisp/miscl.el (mark-beginning-of-buffer):
* lisp/miscl.el (mark-end-of-buffer):
* lisp/miscl.el (upcase-char):
* lisp/miscl.el (forward-to-word):
* lisp/miscl.el (backward-to-word):
Add autoload cookie.
2016-10-22 13:07:32 +02:00
Martin Rudalics
d45be6bc45 On terminal frames ignore minibuffer frame parameter (Bug#24758)
* src/frame.c (Fmake_terminal_frame): Don't complain when the
caller asks for a deviant minibuffer setting (Bug#24758).
2016-10-22 11:52:39 +02:00
Noam Postavsky
9da53e2d35 Let describe-function work for lambda again
Since commit "* lisp/help-fns.el (describe-function): More type
checking[...]", `describe-function' throws a user-error when given a
non-symbol.  This prevents the [back] button in a *Help* buffer from
working when the page it goes back to describes an anonymous
function (e.g., the result of `describe-key' on a key which is bound to
a lambda form).

* lisp/help-fns.el (describe-function): Move the checks on FUNCTION
being an fbound symbol into the `interactive' form.  This allows
non-interactive calls to pass an anonymous function (Bug #24221).  Note
that passing a non-bound symbol non-interactively will still trigger a
`void-function' error from `describe-function-1'.
2016-10-21 22:39:37 -04:00