1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-24 13:32:41 -08:00
Commit graph

115625 commits

Author SHA1 Message Date
Paul Eggert
cefcfbcc1b Merge from gnulib.
This incorporates:
2014-03-26 strftime: wrap macros in "do {...} while(0)"
* lib/strftime.c, doc/misc/texinfo.tex: Update from gnulib.
2014-03-25 21:16:13 -07:00
Paul Eggert
b18d7820f3 * insdel.c (adjust_markers_for_delete): Remove unused local. 2014-03-25 21:07:25 -07:00
Barry O'Reilly
657e54f709 Addendum to: Undo in region after markers in undo history relocated
* simple.el (primitive-undo): Correction to 2014-03-24 change.

Fixes: debbugs:16818
2014-03-25 19:30:08 -04:00
Eli Zaretskii
75b7e407e8 Improve doc of file-symlink-p per bug #17073.
doc/lispref/files.texi (Kinds of Files): Improve documentation of
 file-symlink-p.  Add cross-references.
2014-03-25 18:08:45 +02:00
Michael Albinus
08cf935b84 * net/tramp-sh.el (tramp-do-copy-or-rename-file-directly): In the
`rename' case, check whether source directory has set the sticky bit.
2014-03-25 10:49:37 +01:00
Michael Albinus
1f73d6c675 * net/tramp.el (tramp-methods, tramp-connection-timeout): Fix docstring.
* net/tramp-sh.el (tramp-sh-handle-vc-registered): Revert change
from 2014-03-07, it decreases performance unnecessarily.  Let-bind
`remote-file-name-inhibit-cache' to nil in the second pass.
(tramp-find-executable): Do not call "which" on SunOS.
(tramp-send-command-and-check): Fix docstring.
2014-03-25 09:16:49 +01:00
Michael Albinus
c7d0e04c9d Fix last ChangeLog entry. 2014-03-25 08:34:30 +01:00
Barry O'Reilly
37ea8275f7 Undo in region after markers in undo history relocated
* simple.el (primitive-undo): Only process marker adjustments
validated against their corresponding (TEXT . POS).  Issue warning
for lone marker adjustments in undo history.  (Bug#16818)
(undo-make-selective-list): Add marker adjustments to selective
undo list based on whether their corresponding (TEXT . POS) is in
the region.  Remove variable adjusted-markers, which was unused
and only non nil during undo-make-selective-list.
(undo-elt-in-region): Return nil when passed a marker adjustment
and explain in function doc.

Have (MARKER . ADJUSTMENT) undo records always be immediately
after their corresponding (TEXT . POS) record in undo list.
(Bug#16818)
* lisp.h (record-delete): New arg record_markers.
(record_marker_adjustment): No longer needed outside undo.c.
* insdel.c (adjust_markers_for_delete): Move calculation of marker
adjustments to undo.c's record_marker_adjustments.  Note that
fileio.c's decide_coding_unwind is another caller to
adjust_markers_for_delete.  Because it has undo list bound to t,
it does not rely on adjust_markers_for_delete to record marker
adjustments.
(del_range_2): Swap call to record_delete and
adjust_markers_for_delete so as undo marker adjustments are
recorded before current deletion's adjustments, as before.
(adjust_after_replace):
(replace_range): Pass value for new record_markers arg to
delete_record.
* undo.c (record_marker_adjustment): Renamed to
record_marker_adjustments and made static.
(record_delete): Check record_markers arg and call
record_marker_adjustments.
(record_change): Pass value for new record_markers arg to
delete_record.
(record_point): at_boundary calculation no longer needs to account
for marker adjustments.

* undo-tests.el (undo-test-marker-adjustment-nominal):
(undo-test-region-t-marker): New tests of marker adjustments.
(undo-test-marker-adjustment-moved):
(undo-test-region-mark-adjustment): New tests to demonstrate
bug#16818, which fail without the fix.

* markers.texi (Moving Marker Positions): The 2014-03-02 doc
change mentioning undo's inability to handle relocated markers no
longer applies.  See bug#16818.
* text.texi (Undo): Expand documentation of (TEXT . POS) and
(MARKER . ADJUSTMENT) undo elements.
2014-03-24 22:47:39 -04:00
Dmitry Gutov
3e2377ce2f Fix bug#16762
* lisp/emacs-lisp/package.el (package--add-to-archive-contents):
Include already installed and built-in packages in
`package-archive-contents'.
(package-install): Don't include already installed packages in the
options on interactive invocation.
2014-03-25 00:38:06 +02:00
Daniel Colascione
544ab460f5 Backport &key-parsing improvement from trunk 2014-03-24 13:41:08 -07:00
Juanma Barranquero
c3561529d2 lisp/frameset.el (frameset--initial-params): Fix typo in parameter name. 2014-03-24 21:01:21 +01:00
Nicolas Richard
74be16492f lisp/align.el (align-region): Do not fail when end-mark is nil (bug#17088). 2014-03-24 17:54:24 +01:00
Dmitry Gutov
c2d6c639cf Match special globals in Ruby better
* lisp/progmodes/ruby-mode.el (ruby-expression-expansion-re):
Match special global variables without curlies, too.
(ruby-font-lock-keywords): Simplify the matcher for special global
variables.  Don't require a non-word character after the variable.

Fixes: debbugs:17057
2014-03-24 10:53:56 +02:00
Martin Rudalics
f2999a33d0 Refine previous fix of x_set_window_size to handle Bug#17077.
* w32term.c (x_set_window_size): Refine fix from 2014-03-14
(Bug#17077).
2014-03-24 09:50:17 +01:00
Michael Albinus
39e98ed4ff * tramp.texi (Frequently Asked Questions): Add fish shell settings. 2014-03-24 09:09:42 +01:00
Glenn Morris
33f0ba7e49 * src/fileio.c (Ffile_symlink_p): Doc fix.
Fixes: debbugs:17073
2014-03-23 16:38:40 -07:00
Stefan Monnier
f6614a4770 * lisp/simple.el (redisplay-highlight-region-function): Increase priority of
overlay to make sure boundaries are visible.
* src/buffer.c (struct sortvec): Add field `spriority'.
(compare_overlays): Use it.
(sort_overlays): Set it.

Fixes: debbugs:15899
2014-03-23 18:30:47 -04:00
Juanma Barranquero
ee79b33f49 lisp/frameset.el (frameset-restore): Compare display strings with equal. 2014-03-23 23:14:11 +01:00
Juanma Barranquero
3ea2c7811b lisp/frame.el (make-frame): Don't quote display name in error message. 2014-03-23 23:11:59 +01:00
Eli Zaretskii
9729c262eb Fix ChangeLog entry of last commit. 2014-03-23 17:59:15 +02:00
Eli Zaretskii
88c569ef11 Fix bug #17047 with cursor motion when invisible text starts a line.
src/xdisp.c (redisplay_window): If all previous attempts to find the
 cursor row failed, try a few alternatives before falling back to
 the top-most row of the window.  Use row_containing_pos.
2014-03-23 17:57:25 +02:00
Thierry Volpiatto
f1e06f7bff * net/tramp.el (tramp-read-passwd): Suspend the timers while reading
the password.
2014-03-23 10:22:16 +01:00
Dmitry Gutov
2614c1af39 * lisp/emacs-lisp/package.el (package-show-package-list): If the buffer
is already displayed in another window, switch to that window.
2014-03-23 10:35:56 +02:00
Daniel Colascione
a41475e146 Backport memory info in bug reports (2014-03-21T21:27:25Z!dancol@dancol.org) from trunk 2014-03-22 23:16:14 -07:00
Daniel Colascione
e4e40f72f3 Backport memory fix (2014-03-22T03:04:53Z!dancol@dancol.org) from trunk 2014-03-22 23:07:54 -07:00
Daniel Colascione
e611af505f Backport memory fix (2014-03-23T05:15:48Z!dancol@dancol.org) from trunk 2014-03-22 23:05:54 -07:00
Daniel Colascione
7eab98da1b Fix keyword argument parsing. Please bootstrap. 2014-03-22 23:00:18 -07:00
Dmitry Gutov
0ceba22e53 Fix test failure in non-graphical mode
* test/automated/package-test.el (package-test-describe-package):
Fix test failure in non-graphical mode.

Add some missing ChangeLog entries.
2014-03-23 05:26:13 +02:00
Richard M. Stallman
9e37f3b9c3 Backport Yeeloong battery.el fix from trunk
Ref: http://lists.gnu.org/archive/html/emacs-devel/2014-03/msg00782.html

* lisp/battery.el (battery-linux-sysfs):
Search for each field from the beginning of the buffer.
2014-03-22 17:08:47 -07:00
Glenn Morris
3e702d1649 * etc/PROBLEMS: Small copyedits. 2014-03-22 15:56:29 -07:00
Glenn Morris
4118be693d * lispref/commands.texi (Defining Commands): Tweak previous change. 2014-03-22 14:41:31 -07:00
Glenn Morris
eb6f0d5663 * lispref/commands.texi (Defining Commands): List interactive-only values. 2014-03-22 12:54:48 -07:00
Dmitry Gutov
1197f2e665 Fix bug#16873
* lisp/emacs-lisp/package.el (package-desc): Use the contents of the
quoted form, not its cdr.
2014-03-22 10:43:30 +02:00
Eli Zaretskii
4568178886 doc/lispref/functions.texi (Core Advising Primitives): Fix cross-reference in last change. 2014-03-22 10:35:03 +02:00
Eli Zaretskii
e74e1d1bf8 Revert last commit. 2014-03-22 10:28:20 +02:00
Matthias Dahl
7c326d7116 Fix bug #16694 with face attributes changed by themes.
lisp/faces.el (face-spec-recalc): Doc fix.  Call
 make-face-x-resource-internal earlier, and condition that on
 no-init-from-resources being nil.
2014-03-22 10:18:42 +02:00
Juanma Barranquero
aac06179d8 lisp/w32-common-fns.el (x-selection-owner-p): Get documentation from DOC.
Add empty docstring for the benefit of doc.c; change parameter profile
to match the X function.
2014-03-22 01:24:00 +01:00
Stefan Monnier
0c0ec04163 * doc/lispref/functions.texi (Advising Functions): Explain a bit more how
arguments work.
(Advice combinators): New node.
(Core Advising Primitives): Use it.  Expand description of "depth".
(Advising Named Functions): Document limitation of advices on macros.
2014-03-21 17:47:52 -04:00
Michael Albinus
1e92a8a3aa * net/tramp.el (tramp-methods): Add docstring for `tramp-login-env'
and `tramp-copy-env'.

* net/tramp-sh.el (tramp-methods) <sudo>: Add `tramp-login-env'.
  (tramp-maybe-open-connection): Handle `tramp-login-env'.
2014-03-21 14:02:25 +01:00
YAMAMOTO Mitsuharu
fef27dc1ad Fix regression introduced by patch for Bug#10500.
* xterm.c (x_draw_image_relief): Respect Vtool_bar_button_margin.
* w32term.c (x_draw_image_relief): Likewise.
2014-03-21 19:14:10 +09:00
Martin Rudalics
21e18b30e2 Truly maximize w32 frames with odd fonts and some texi fixes.
* w32fns.c (w32_wnd_proc): For WM_WINDOWPOSCHANGING don't
constrain frame size in SW_SHOWMAXIMIZED case so we can truly
maximize a frame for odd default fonts.
* frames.texi (Size and Position): In `frame-resize-pixelwise'
description drop remark about frame maximization.
* windows.texi (Display Action Functions): Add description for
`display-buffer-no-window' and explain use of `allow-no-window'
alist entries.
2014-03-21 10:23:22 +01:00
Glenn Morris
78540c42f1 * lisp/electric.el (electric-indent-post-self-insert-function): Add doc. 2014-03-21 00:19:21 -07:00
Glenn Morris
9ee59bca7a * lispref/commands.texi (Defining Commands): Copyedit re `interactive-only'. 2014-03-21 00:06:55 -07:00
Glenn Morris
f167458b5e Tiny doc/misc edits
* doc/misc/ede.texi (ede-linux):
* doc/misc/vip.texi (New Bindings): Tiny copyedits.
2014-03-21 00:00:21 -07:00
Glenn Morris
3e77f05d91 Add some standard finder Keywords: to lisp/nxml/*.el. 2014-03-20 23:56:55 -07:00
Dmitry Gutov
dcf7866712 Fix bug#16826
* lisp/emacs-lisp/package.el (package-compute-transaction):
Use `version-list-<=' to compare the requirement version against
the package version already to be installed.  Update the error
message.
2014-03-21 08:06:52 +02:00
Dmitry Gutov
1fc8f6559a Fix bug#17050
* lisp/progmodes/ruby-mode.el (ruby-smie-rules):
Add indentation rule for ` @ '.
2014-03-21 06:26:39 +02:00
Juanma Barranquero
dada060d9f lisp/*.el: Fix typos.
* lisp/align.el (align-regexp): Remove superfluous backslash.

* lisp/ffap.el (ffap-ftp-default-user, ffap-url-regexp)
  (ffap-pass-wildcards-to-dired, dired-at-point-require-prefix)
  (ffap-rfc-path, ffap-ftp-sans-slash-regexp, ffap-menu-regexp):
  Fix docstring typos.
  (ffap-next): Use C-u in docstring.
  (ffap-machine-p, ffap-list-env, ffap-alist, ffap-alist)
  (ffap-string-at-point-mode-alist, ffap-menu, ffap-menu-ask):
  Remove superfluous backslashes.
  (ffap-string-at-point): Reflow docstring.

* lisp/server.el (server-host): Reflow docstring.
  (server-unload-function): Fix docstring typo.
  (server-eval-at): Remove superfluous backslash.

* lisp/skeleton.el (skeleton-insert): Remove superfluous backslash.
  (skeleton-insert): Doc fix.
  (skeleton-insert): Reflow docstring.

* lisp/term/tty-colors.el (tty-color-alist, tty-modify-color-alist)
  (tty-color-approximate, tty-color-by-index, tty-color-values)
  (tty-color-desc): Remove superfluous backslashes.
2014-03-21 02:12:57 +01:00
Paul Eggert
1271626ab5 Backport doc.c fix from trunk.
* doc.c (store_function_docstring): Fix pointer signedness mismatch.
2014-03-20 17:10:29 -07:00
Paul Eggert
a2326811fc Backport doc fix from trunk.
* internals.texi (C Integer Types): Prefer 'false' and 'true'
to '0' and '1' for booleans.
2014-03-20 16:15:19 -07:00