1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-05-02 11:10:41 -07:00
Commit graph

124627 commits

Author SHA1 Message Date
Eli Zaretskii
326c64fcc3 Fix splash screen display at startup
* src/frame.c (DEFAULT_ROWS): Enlarge to 36, so that the initial
window displayed by "emacs -q" has enough space to show the whole
text even if it includes 2 lines talking about recovering crashes
sessions.  (Bug#23074)

* lisp/startup.el (use-fancy-splash-screens-p): Fix off-by-one
error when computing the window-height from frame-height.

* etc/NEWS: Mention the change.
2016-03-25 10:45:39 +03:00
Martin Rudalics
7ab2a9743f ; In NEWS mention new display of minibuffer completions window 2016-03-25 08:38:34 +01:00
Martin Rudalics
a1cd84cffc Describe temporary displays in Emacs manual
* doc/emacs/emacs.texi (Temporary Displays): New subsubsection.
* doc/emacs/windows.texi (Window Choice): Minor fixes.
(Temporary Displays): New subsubsection describing display of
temporary buffers and `temp-buffer-resize-mode'.
2016-03-25 08:30:23 +01:00
Paul Eggert
5ec105648b Avoid stray As next to IDLW icons
* lisp/progmodes/idlw-toolbar.el (idlwave-toolbar-add-everywhere):
Use "" for empty labels, not "a", as the latter now displays stray
"A"s (Bug#18997).
2016-03-24 16:53:24 -07:00
Paul Eggert
45577d548d Avoid GTK 3 crash with icons and masks
Problem reported by Mosè Giordano (Bug#18997).
* src/gtkutil.c (xg_get_pixbuf_from_pixmap): Remove.
(xg_get_pixbuf_from_pix_and_mask): Do not use
xg_get_pixbuf_from_pixmap, as it is poorly documented.  Instead,
invoke XGetPixel directly.  This is slow but speed is not
important here.  Also, fail for unusual situations (not TrueColor,
or images that are not 8 bits per sample) instead of displaying
junk or crashing.
2016-03-24 16:53:23 -07:00
Juri Linkov
e99ff6e85a * lisp/minibuffer.el (minibuffer-completion-help): Use fit-window-to-buffer
instead of shrink-window-if-larger-than-buffer.  (Bug#23092)
2016-03-25 00:14:24 +02:00
Eli Zaretskii
077b78cffc Define make_save_ptr_ptr unconditionally
* src/alloc.c (make_save_ptr_ptr): Remove the !(defined
USE_X_TOOLKIT || defined USE_GTK) conditional.  Reported by
Philipp Stephani <phst@google.com>.  (Bug#23101)
2016-03-24 20:52:45 +02:00
Eli Zaretskii
20a1003f6d Preserve current buffer when popping up TTY menus
* src/term.c (tty_menu_show): Be sure to save and restore the
current buffer around TTY menu pop-ups.  (Bug#23101)
2016-03-24 20:05:49 +02:00
Eli Zaretskii
7eba90c122 Improve font selection by family on MS-Windows
* src/w32font.c (w32font_list_internal): Allow 'ascii-0' charset,
in addition to 'iso10646-1', 'unicode-bmp', and 'unicode-sip'.
This avoids rejecting many font families whose members are shown
by 'font-family-list', in particular 'courier' requested by
info.el.  Without this change, many values of ':family' attribute
of a face have no effect on MS-Windows, because they are rejected
due to bogus mismatch of the charset.
2016-03-24 18:30:41 +02:00
Paul Eggert
73d213f281 Comint, term, and compile now set EMACS
This fixes directory tracking in ansi-term, at the expense of
breaking some usages of 'configure'.  Setting EMACS is meant to be
a somewhat temporary measure, until Bash 4.4 comes out and is
common.  (Bug#20484).
* etc/NEWS: Document this.
* lisp/comint.el (comint-exec-1):
* lisp/net/tramp-sh.el (tramp-remote-process-environment):
* lisp/progmodes/compile.el (compilation-start):
* lisp/term.el (term-exec-1):
Go back to setting the EMACS environment variable, for backward
compatibility to Bash 4.3 and earlier.
2016-03-23 15:08:19 -07:00
Paul Eggert
9524ec5e4e Ignore more merges when generating ChangeLog
* build-aux/gitlog-to-emacslog: Ignore all merges from gnu.org,
not merely those from master and emacs-NN.  The ChangeLog entries
they generate are not that useful.
2016-03-23 15:08:18 -07:00
Paul Eggert
ad250f2b67 Sync with gnulib
This incorporates:
2016-03-22 gitlog-to-changelog: suppress ignored chatter
2016-03-21 sys_select: port to new Cygwin
* build-aux/gitlog-to-changelog, doc/misc/texinfo.tex:
* lib/sys_select.in.h: Copy from gnulib.
2016-03-23 11:19:52 -07:00
Paul Eggert
c0165ea4d6 Resurrect GNUS-NEWS autogeneration
* doc/misc/gnus-coding.texi (Gnus Maintenance Guide): Update
GNUS-NEWS section to match current file locations and procedure.
* etc/GNUS-NEWS: Regenerate by using new procedure.
* lisp/Makefile.in (update-gnus-news): New rule, containing a
procedure for building GNUS-NEWS.  The old procedure got lost
somehow when Gnus was merged into Emacs.
2016-03-23 00:08:21 -07:00
Paul Eggert
1e5327c7c7 ; Backport ChangeLog.2 fixes from master 2016-03-22 13:22:50 -07:00
Anders Lindgren
e643977b6b Make `toggle-frame-maximized' respect the dock on OS X (bug#22988).
* src/nsterm.m (ns_screen_margins): New function.
(ns_screen_margins_ignoring_hidden_dock): New function.
(ns_menu_bar_height): Reimplement in terms of `ns_screen_margins'.
([EmacsWindow zoom:]): Take all screen margins (except those
originating from a hidden dock) into account.
2016-03-22 20:18:33 +01:00
Eli Zaretskii
38a43f1a8f Fix bug in displaying header line with a box face
* src/xdisp.c (get_next_display_element): Handle the case when a
display string acquires the box face from an underlying string,
not from the buffer.  (Bug#23091)
2016-03-22 20:16:42 +02:00
Kaushal Modi
91e667692b Fix an Isearch var to be a string (Bug#23038)
* isearch.el (isearch--describe-regexp-mode): The `description' var
  needs to always be a string.  Add the missing default case for the
  cond form that ensures that.

Before this bug fix, for the events when `regexp-function' and
`search-default-mode' both were nil, `description' also stayed nil.  So
when `space-before' was non-nil, the "non-string" `description'
(with a value of nil) got passed as an argument to
`replace-regexp-in-string' (where a string was expected).  That caused
the error described in Bug#23038.
2016-03-22 01:05:24 +01:00
Leo Liu
76ef52267c Fix (args-out-of-range 1) error in cursor-sensor--detect
* lisp/emacs-lisp/cursor-sensor.el (cursor-sensor--detect): Don't
  hard-code (point-min) as 1 which fails in narrowed buffers.
2016-03-21 18:26:40 +08:00
Lars Magne Ingebrigtsen
8a35f83c6c Render empty <ul><li><ul> correctly
* lisp/net/shr.el (shr-tag-ul): Render empty <ul><li><ul>
correctly (bug#22964).
(cherry picked from commit 4f6ea3988b)

Backport:
2016-03-20 13:58:26 +01:00
Lars Magne Ingebrigtsen
d8b2ce5f8a Ignore invalid base64 encoded embedded images
* lisp/net/shr.el (shr-image-from-data): Ignore invalid base64
encoded embedded images (bug#22928).
(cherry picked from commit f2da80d0e1)

Backport:
2016-03-20 13:58:04 +01:00
Lars Magne Ingebrigtsen
52ba24bdd9 Fix <p> and <div> newlines with or without <li> in shr
* lisp/net/shr.el (shr-ensure-newline): Respect that we're in
a <li>, if we are, and don't insert newlines there.
(shr-ensure-paragraph): When mixing newlines and paragraph
ensurements, don't insert too many blank lines.
(shr-tag-div): A <div> shouldn't introduce a paragraph, but a
new line.
(cherry picked from commit 292921faca)

Backport:
2016-03-20 13:45:09 +01:00
Eli Zaretskii
b8ea08b037 Avoid errors in 'newline'
* lisp/simple.el (newline): Don't barf if invoked with
non-positive argument in the middle of a line.  (Bug#22490)
2016-03-19 21:32:27 +02:00
Michael Albinus
fc3cd53900 Fix Bug#23032
* doc/misc/eshell.texi (Arguments): Mention the pipe symbol in
remote file names.  (Bug#23032)
2016-03-19 16:51:46 +01:00
Eli Zaretskii
dd2737b375 Adjudicate review comments in abbrevs.texi
* doc/lispref/abbrevs.texi (Abbrev Files, Abbrev Expansion):
* doc/emacs/abbrevs.texi (Dabbrev Customization): State the
default values of variables.  Suggested by Steve Byrne
<sbb@penguinis.org>.  (Bug#23016)

* admin/release-process (Check manuals): Mark files reviewed by
Steve Byrne.
2016-03-19 13:05:55 +02:00
Dmitry Gutov
26f9c5075f Fixup the "normal" matcher; highlight global var symbols, too
* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight
operator name symbols with the "normal" matcher (it actually
needed updating).  Highlight global variable symbols, too.
2016-03-19 00:37:54 +02:00
Tassilo Horn
413e73b5db ; Small theme additions 2016-03-18 23:29:58 +01:00
Marcin Borkowski
cd950da9db Honor prefix arg in doc-view-next-line-or-next-page
* lisp/doc-view.el (doc-view-next-line-or-next-page): Take the
prefix argument into consideration when continuous scrolling is
not in effect (i.e., by default) (bug#19559).
2016-03-18 22:46:42 +01:00
Paul Eggert
ed909c049e ; Spelling fixes 2016-03-18 08:55:26 -07:00
Paul Eggert
6da3a6dc9e Port to strict C99 offsetof
* src/bidi.c (bidi_copy_it):
* src/lisp.h (CHAR_TABLE_EXTRA_SLOTS):
Use only a single identifier as the second argument of offsetof.
Found by using clang -pedantic.
2016-03-18 08:43:32 -07:00
Paul Eggert
de7601f149 Port to GTK with strict C11 compiler
* src/gtkutil.c (xg_create_frame_widgets, xg_toggle_notify_cb):
Cast from function type to void * where the C standard requires this.
This works around a problem in the prototypes for
g_signal_handler_find and g_signal_handlers_block_by_func, which
use gpointer instead of GCallback.  Found by using gcc -pedantic.
2016-03-18 08:43:32 -07:00
Paul Eggert
658aa2dae8 Port to GTK with strict C99 compiler
* src/emacsgtkfixed.c: Use workaround for GNOME bug 683906 only
in glib 2.35.6 and earlier, since the bug is fixed in 2.35.7.
* src/emacsgtkfixed.c (EmacsFixedPrivate):
* src/emacsgtkfixed.h (EmacsFixedClass):
Remove duplicate typedef, which strict C99 does not allow (Bug#23003).
2016-03-17 23:45:23 -07:00
Anders Lindgren
1df7173eb2 Avoid screen artifacts with new OS X visible bell after scrolling
* src/nsterm.m (EmacsBell): Save NSView when displaying the
visible bell and set `needsDisplay' when removed.
(hide_bell): Trace.
(ns_copy_bits): Trace.
2016-03-17 21:07:04 +01:00
Michael Albinus
7a2edd3427 Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25 2016-03-17 20:34:49 +01:00
Michael Albinus
dca240a70d Suppress some Tramp tests for OSX, do not merge with master
* test/automated/tramp-tests.el (tramp--test-darwin-p): New defun.
(tramp--test-utf8): Use it.  (Bug#22145)
2016-03-17 20:33:51 +01:00
Glenn Morris
9094304a9c * lisp/progmodes/xref.el (xref-buffer-name, xref--window):
Move definitions before use.
2016-03-17 12:55:09 -04:00
Glenn Morris
cbedfc2658 * lisp/gnus/mm-decode.el (gnus-format-message): Autoload it.
; Do not merge to master.
2016-03-17 12:52:11 -04:00
Glenn Morris
005ac7c28b * lisp/mail/rmail.el (rmail-mime-entity-truncated): Declare. 2016-03-17 09:04:51 -07:00
Glenn Morris
9ab03f27fa ; Auto-commit of loaddefs files. 2016-03-17 07:18:52 -04:00
Glenn Morris
56df61712a Address compilation warnings due to 2016-01-03 mml refactoring.
* lisp/gnus/mml-sec.el (password-cache, mm-encode): Require.
(message-options-get): Autoload.
(message-options-set): Declare.
(mml-secure-cache-passphrase, mml-secure-passphrase-cache-expiry):
Simplify default value.
* lisp/gnus/mml-smime.el (message-options-set): Remove declaration.
* lisp/gnus/mml1991.el, lisp/gnus/mml2015.el:
No longer a need for password-cache.
2016-03-16 23:56:32 -07:00
Stefan Monnier
a1ef911f31 * lisp/emacs-lisp/smie.el (smie-indent-keyword): Don't burp in strings
(bug#22960).
2016-03-16 22:55:56 -04:00
Glenn Morris
79ae7fbe91 * lisp/dired-x.el (dired-omit-here-always): Correct error message
for 2016-01-25 change.
2016-03-16 17:38:27 -04:00
Glenn Morris
253929fee3 * lisp/dired-x.el (dired-omit-here-always): Replace undefined function
removed 2016-01-30.

; Do not merge to master.
2016-03-16 17:36:57 -04:00
Glenn Morris
ce533897e0 * lisp/xml.el (xml-parse-tag-1): Replace undefined function.
; string-empty-p is defined in subr-x, but this file does not load it.
2016-03-16 17:24:36 -04:00
Eli Zaretskii
d6d164f611 Avoid segfaults due to frame image cache being absent
* src/image.c (cache_image): If the frame doesn't have an image
cache, create it.  (Bug#23028)
2016-03-16 19:04:16 +02:00
Eli Zaretskii
bc7f6f6329 Improve documentation of glyphless-character display
* doc/emacs/display.texi (Text Display): Document and index the
'glyphless-char' face.
2016-03-16 18:57:46 +02:00
Eli Zaretskii
6b6916e872 ; * src/xdisp.c (with_echo_area_buffer): Fix typos in comments. 2016-03-16 18:52:36 +02:00
Dmitry Gutov
ee9a1f7ee9 Support safe navigation operator in non-SMIE indentation code
* lisp/progmodes/ruby-mode.el (ruby-calculate-indent):
Support safe navigation operator in non-SMIE indentation code.
Cherry-picked from
68e16ddd79.
2016-03-16 16:16:50 +02:00
Thomas Fitzsimmons
c3ed95b1c5 Move xsd:base64Binary decoding fix to debbugs.el 0.9.1
* lisp/net/soap-client.el (soap-encode-xs-basic-type): Do not
assume xsd:base64Binary values are UTF-8 strings.
(soap-decode-xs-basic-type): Likewise.
(soap-invoke): Document xsd:base64Binary handling.
2016-03-16 09:35:59 -04:00
Dmitry Gutov
2036be4666 Fix Ruby's operator precedence
* lisp/progmodes/ruby-mode.el (ruby-smie-grammar):
Rearrange the smie-precs->prec2 form.
2016-03-16 04:32:59 +02:00
Dmitry Gutov
1d686c2afb (ruby-interpolation-inside-another-interpolation): New failing test
* test/automated/ruby-mode-tests.el
(ruby-interpolation-inside-another-interpolation):
New failing test.
2016-03-16 01:48:33 +02:00