]> git.eshelyaron.com Git - emacs.git/log
emacs.git
9 years ago; * src/font.c (syms_of_font) <font-log>: Tweak previous doc fix.
Glenn Morris [Sun, 7 Jun 2015 23:55:00 +0000 (16:55 -0700)]
; * src/font.c (syms_of_font) <font-log>: Tweak previous doc fix.

9 years ago* admin/update_autogen (changelog_files): Remove gitlog-to-emacslog.
Glenn Morris [Sun, 7 Jun 2015 23:51:44 +0000 (16:51 -0700)]
* admin/update_autogen (changelog_files): Remove gitlog-to-emacslog.

9 years ago* src/font.c (syms_of_font) <font-log>: Doc fix.
Glenn Morris [Sun, 7 Jun 2015 23:51:11 +0000 (16:51 -0700)]
* src/font.c (syms_of_font) <font-log>: Doc fix.

9 years agoRemove the obsolete leading "*" from some C doc strings.
Glenn Morris [Sun, 7 Jun 2015 23:47:45 +0000 (16:47 -0700)]
Remove the obsolete leading "*" from some C doc strings.

* src/coding.c (syms_of_coding):
* src/font.c (syms_of_font): Remove leading "*" from docs.

* lisp/cus-start.el (enable-character-translation): Add it.

9 years agoMove gen_origin from program to data
Paul Eggert [Sun, 7 Jun 2015 22:40:10 +0000 (15:40 -0700)]
Move gen_origin from program to data

That way, 'make change-history' needs to change only ChangeLog.2,
instead of having to change two files.
* ChangeLog.2: Add commit info for range that this file covers.
* Makefile.in (new_commit_regexp): New macro.
(change-history-nocommit): Simplify, by putting what used to be
the gen_origin value into the data (ChangeLog.2) rather than
into the program (gitlog-to-emacslog).
* build-aux/gitlog-to-emacslog (gen_origin): Calculate from
the input file (e.g., ChangeLog.2) rather than by having a
constant in the program.  Substitute it into the output.

9 years agoEscape any quotes in the function name
Dmitry Gutov [Sun, 7 Jun 2015 20:39:18 +0000 (23:39 +0300)]
Escape any quotes in the function name

* lisp/help-fns.el (help-fns--signature): Quote any quotes in the
function name (bug#20759).

9 years agoAdapt 'struct timespec' to next release of MinGW runtime
Eli Zaretskii [Sun, 7 Jun 2015 15:36:25 +0000 (18:36 +0300)]
Adapt 'struct timespec' to next release of MinGW runtime

* nt/inc/ms-w32.h (struct timespec): Don't declare if
__struct_timespec_defined is defined.

9 years ago; Auto-commit of ChangeLog files.
Glenn Morris [Sun, 7 Jun 2015 10:25:33 +0000 (06:25 -0400)]
; Auto-commit of ChangeLog files.

9 years agoMerge from gnulib
Paul Eggert [Sun, 7 Jun 2015 01:37:45 +0000 (18:37 -0700)]
Merge from gnulib

This incorporates:
2015-06-06 acl-permissions: pacify -Wsuggest-attribute=const
2015-06-05 stdio: Don't redefine gets when using C++
2015-06-05 acl-permissions: port to AIX, C89 HP-UX
2015-06-02 file-has-acl: fix build on Mac OS X 10
2015-06-01 gnulib-tool: concatenate lib_SOURCES to a single line
2015-06-01 pthread_sigmask: discount system version if a simple macro
2015-05-31 readlinkat: avoid OS X 10.10 trailing slash bug
* doc/misc/texinfo.tex, lib/acl-internal.h, lib/get-permissions.c:
* lib/readlinkat.c, lib/set-permissions.c, lib/stdio.in.h:
* m4/acl.m4, m4/pthread_sigmask.m4, m4/readlinkat.m4: Copy from gnulib.
* lib/gnulib.mk: Regenerate.

9 years ago* lisp/progmodes/grep.el (zrgrep): Let-bind grep-highlight-matches
Juri Linkov [Sat, 6 Jun 2015 22:02:38 +0000 (01:02 +0300)]
* lisp/progmodes/grep.el (zrgrep): Let-bind grep-highlight-matches

before calling grep-compute-defaults because now it affects the
command lines computed in grep-compute-defaults. (Bug#20728)

9 years agoAddress some compilation warnings.
Glenn Morris [Sat, 6 Jun 2015 19:12:06 +0000 (12:12 -0700)]
Address some compilation warnings.

* lisp/international/mule-cmds.el (w32-get-console-codepage)
(w32-get-console-output-codepage):
* lisp/progmodes/elisp-mode.el (xref-collect-references):
* lisp/version.el (cairo-version-string): Declare.

* lisp/erc/erc.el (erc-nickname-in-use): Fix typo.

9 years agoFix display when a font claims large values of ascent and descent
Eli Zaretskii [Sat, 6 Jun 2015 12:55:15 +0000 (15:55 +0300)]
Fix display when a font claims large values of ascent and descent

This fixes bug#20628.

* src/xdisp.c (get_phys_cursor_geometry): Correct the Y
coordinate of a hollow cursor glyph when the original glyph's
ascent is too small.
(get_font_ascent_descent, normal_char_ascent_descent)
(normal_char_height): New functions.
(handle_single_display_spec, append_space_for_newline)
(calc_pixel_width_or_height, produce_stretch_glyph)
(calc_line_height_property): Use normal_char_ascent_descent and
normal_char_height.
(x_produce_glyphs): When font-global values of ascent and descent
are too large, use per-character glyph metrics instead, if
possible.  But don't allow the glyph row's ascent and descent
values become smaller than the values from the metrics of the
font's "normal" character.

* src/xftfont.c (xftfont_draw):
* src/w32font.c (w32font_draw): Correct the values of ascent and
descent used to draw glyphless characters' hex code in a box.

* src/xterm.c (x_draw_glyph_string_background):
* src/xdisp.c (x_produce_glyphs):
* src/w32term.c (x_draw_glyph_string_background):
* src/nsterm.m (ns_maybe_dumpglyphs_background): Use FONT_TOO_HIGH
to detect fonts whose global ascent and descent values are too
large to be used in layout decision, and redraw the background
when that happens.

* src/dispextern.h (FONT_TOO_HIGH): New macro.
(get_font_ascent_descent): Add prototype.

* src/xterm.c (x_new_font):
* src/w32term.c (x_new_font):
* src/nsterm.m (x_new_font):
* src/font.c (font_open_entity):
* src/composite.c (composition_gstring_width): Use
get_font_ascent_descent to obtain reasonable values for ascent and
descent of a font.

9 years agoAdd assertion in adjust_point_for_property
Nicolas Richard [Sat, 6 Jun 2015 08:05:07 +0000 (10:05 +0200)]
Add assertion in adjust_point_for_property

* src/keyboard.c (adjust_point_for_property): Add eassert for
current buffer being shown in selected window.

9 years agoReplace uses of in-string-p; make it obsolete
Dmitry Gutov [Sat, 6 Jun 2015 09:57:59 +0000 (12:57 +0300)]
Replace uses of in-string-p; make it obsolete

* lisp/thingatpt.el (in-string-p): Declare obsolete (bug#20732).
(end-of-sexp, beginning-of-sexp): Use syntax-ppss instead.

9 years agoFix Dired display of an explicit list of files by ls-lisp.el
Eli Zaretskii [Sat, 6 Jun 2015 09:52:56 +0000 (12:52 +0300)]
Fix Dired display of an explicit list of files by ls-lisp.el

* lisp/ls-lisp.el (ls-lisp-uid-d-fmt, ls-lisp-uid-s-fmt)
(ls-lisp-gid-d-fmt, ls-lisp-gid-s-fmt): Make the initial values be
correct for when displaying individual files separately, not as
part of listing a directory, in which case these values are not
recomputed by 'ls-lisp-insert-directory', but used verbatim.

9 years ago* lisp/dired.el (dired): Doc fix. (Bug#20739)
Eli Zaretskii [Sat, 6 Jun 2015 09:33:59 +0000 (12:33 +0300)]
* lisp/dired.el (dired): Doc fix.  (Bug#20739)

9 years agoDo not adjust point in a non-selected window
Nicolas Richard [Fri, 5 Jun 2015 16:57:26 +0000 (18:57 +0200)]
Do not adjust point in a non-selected window

* src/keyboard.c (command_loop_1): Do not adjust point when
current buffer is not shown in selected window (Bug#20590).

9 years ago* etc/DEBUG: Mention 'maybe_call_debugger'
Nicolas Richard [Fri, 5 Jun 2015 16:54:33 +0000 (18:54 +0200)]
* etc/DEBUG: Mention 'maybe_call_debugger'

9 years agoFix a unit test for map.el
Nicolas Petton [Fri, 5 Jun 2015 23:54:51 +0000 (01:54 +0200)]
Fix a unit test for map.el

* test/automated/map-tests.el (test-map-let): Fix the test to work
with the new syntax of `map-let'.

9 years ago* lisp/emacs-lisp/map.el (map-let): Better docstring.
Nicolas Petton [Fri, 5 Jun 2015 23:54:11 +0000 (01:54 +0200)]
* lisp/emacs-lisp/map.el (map-let): Better docstring.

9 years agoBetter syntax for the map pcase pattern
Nicolas Petton [Fri, 5 Jun 2015 23:50:32 +0000 (01:50 +0200)]
Better syntax for the map pcase pattern

* lisp/emacs-lisp/map.el: Improves the map pcase pattern to take
bindings of the form (KEY PAT) or SYMBOL. KEY is not quoted.

9 years ago* lisp/emacs-lisp/map.el (map--dispatch): Better docstring.
Nicolas Petton [Fri, 5 Jun 2015 23:25:04 +0000 (01:25 +0200)]
* lisp/emacs-lisp/map.el (map--dispatch): Better docstring.

9 years ago; * lisp/emacs-lisp/map.el: Fix formatting.
Nicolas Petton [Fri, 5 Jun 2015 23:09:40 +0000 (01:09 +0200)]
; * lisp/emacs-lisp/map.el: Fix formatting.

9 years agoFix a byte-compiler error in map-put and map-delete
Nicolas Petton [Fri, 5 Jun 2015 23:08:00 +0000 (01:08 +0200)]
Fix a byte-compiler error in map-put and map-delete

* lisp/emacs-lisp/map.el (map-put, map-delete): Ensure that `setq' is
called with a symbol.

9 years ago* admin/gitmerge.el (gitmerge-commit-message):
Glenn Morris [Fri, 5 Jun 2015 22:10:07 +0000 (18:10 -0400)]
* admin/gitmerge.el (gitmerge-commit-message):

Revert to including "skipped" messages in ChangeLog once again.

9 years agoUse string> instead of equiv lambda with string<
Tassilo Horn [Fri, 5 Jun 2015 21:58:39 +0000 (23:58 +0200)]
Use string> instead of equiv lambda with string<

* lisp/help.el (view-emacs-news): Use string> instead of equivalent
lambda with string<.

9 years ago* lisp/emacs-lisp/map.el (map--dispatch): Move before use.
Glenn Morris [Fri, 5 Jun 2015 20:30:39 +0000 (16:30 -0400)]
* lisp/emacs-lisp/map.el (map--dispatch): Move before use.

(map--delete-array): Fix typo.

9 years ago* test/automated/map-tests.el: Replace "assert" with "should".
Glenn Morris [Fri, 5 Jun 2015 20:29:41 +0000 (16:29 -0400)]
* test/automated/map-tests.el: Replace "assert" with "should".

9 years ago* lisp/Makefile.in (SUBDIRS): Rename from SUBDIRS_ABS.
Glenn Morris [Fri, 5 Jun 2015 20:12:44 +0000 (16:12 -0400)]
* lisp/Makefile.in (SUBDIRS): Rename from SUBDIRS_ABS.

(SUBDIRS_REL): Derive from SUBDIRS.

9 years agoTweak some build messages.
Glenn Morris [Fri, 5 Jun 2015 20:10:18 +0000 (16:10 -0400)]
Tweak some build messages.

* lisp/Makefile.in ($(lisp)/loaddefs.el):
* lisp/cus-dep.el (custom-make-dependencies):
* lisp/finder.el (finder-compile-keywords): Say what we are doing.
* lisp/international/titdic-cnv.el (batch-titdic-convert):
Don't say how to compile.

9 years ago; etc/DEBUG copedits
Eli Zaretskii [Fri, 5 Jun 2015 10:45:02 +0000 (13:45 +0300)]
; etc/DEBUG copedits

* etc/DEBUG: Improve the section on debugging redisplay issues.
Also other minor copyedits.

9 years agoOmit U+0332 COMBINING LOW LINE in previous change
Paul Eggert [Fri, 5 Jun 2015 07:04:53 +0000 (00:04 -0700)]
Omit U+0332 COMBINING LOW LINE in previous change

It turns out that it does not work on Ubuntu 15.04.

9 years agoFix transliteration of Bahá'í months
Paul Eggert [Fri, 5 Jun 2015 06:45:40 +0000 (23:45 -0700)]
Fix transliteration of Bahá'í months

* lisp/calendar/cal-bahai.el (calendar-bahai-month-name-array):
Improve quality of Latin transliteration of Bahá'í month names.

9 years agoFix curved quotes in a few places
Paul Eggert [Fri, 5 Jun 2015 06:44:38 +0000 (23:44 -0700)]
Fix curved quotes in a few places

* lisp/calc/calc-misc.el (calc-help): Fix quoting.
The strings in question are not doc strings, so this partially
undoes the recent change that assumed they were doc strings.
* lisp/cedet/srecode/srt-mode.el (srecode-macro-help):
* lisp/info.el (Info-finder-find-node):
Use curved quotes.
* lisp/emacs-lisp/derived.el (derived-mode-make-docstring):
Also allow curved quotes in doc strings.

9 years ago* lisp/Makefile.in (AM_V_at): Add missing definition.
Glenn Morris [Fri, 5 Jun 2015 01:19:22 +0000 (21:19 -0400)]
* lisp/Makefile.in (AM_V_at): Add missing definition.

9 years ago* lisp/Makefile.in: Quieten output a bit.
Glenn Morris [Fri, 5 Jun 2015 01:16:23 +0000 (21:16 -0400)]
* lisp/Makefile.in: Quieten output a bit.

($(lisp)/cus-load.el, $(lisp)/finder-inf.el):
Don't echo directories, since the commands we invoke print them.

9 years ago* lisp/Makefile.in: Replace shell fragments in variables with $(shell).
Glenn Morris [Fri, 5 Jun 2015 01:02:26 +0000 (21:02 -0400)]
* lisp/Makefile.in: Replace shell fragments in variables with $(shell).

(SUBDIRS_REL, SUBDIRS_ABS, SUBDIRS_ALMOST, SUBDIRS_FINDER)
(SUBDIRS_SUBDIRS): New variables.
(setwins, setwins_almost, setwins_finder, setwins_for_subdirs):
Remove.
($(lisp)/cus-load.el, $(lisp)/finder-inf.el, $(lisp)/loaddefs.el)
(update-subdirs, compile-main, compile-clean):
Replace "setwins" usage with new "SUBDIRS" variables.

9 years ago* lisp/vc/compare-w.el (compare-windows-get-window-function):
Glenn Morris [Fri, 5 Jun 2015 00:47:05 +0000 (20:47 -0400)]
* lisp/vc/compare-w.el (compare-windows-get-window-function):

Fix :version tag.

9 years ago* src/ftfont.c (ftfont_open2): Round divisions by upEM.
YAMAMOTO Mitsuharu [Fri, 5 Jun 2015 00:44:40 +0000 (09:44 +0900)]
* src/ftfont.c (ftfont_open2): Round divisions by upEM.

9 years agoUndo removal of x_clear_area call on expose for GTK3 or cairo.
YAMAMOTO Mitsuharu [Fri, 5 Jun 2015 00:41:40 +0000 (09:41 +0900)]
Undo removal of x_clear_area call on expose for GTK3 or cairo.

* src/xterm.c (handle_one_xevent) [HAVE_GTK3 || USE_CAIRO]: Clear
exposed area.  (Bug#20677)

9 years ago* doc/lispref/hash.texi (Creating Hash): Remove obsolete makehash.
Glenn Morris [Thu, 4 Jun 2015 23:27:05 +0000 (19:27 -0400)]
* doc/lispref/hash.texi (Creating Hash): Remove obsolete makehash.

9 years ago* lisp/Makefile.in (check-defun-dups): Also skip ldefs-boot.
Glenn Morris [Thu, 4 Jun 2015 23:26:32 +0000 (19:26 -0400)]
* lisp/Makefile.in (check-defun-dups): Also skip ldefs-boot.

9 years ago* lisp/leim/quail/lrt.el (quail-lrt-update-translation):
Glenn Morris [Thu, 4 Jun 2015 23:25:48 +0000 (19:25 -0400)]
* lisp/leim/quail/lrt.el (quail-lrt-update-translation):

Rename from quail-lao-update-translation, since lao.el defines that.

9 years agoHandle new-style advice in find-funct
Dmitry Gutov [Thu, 4 Jun 2015 22:34:40 +0000 (01:34 +0300)]
Handle new-style advice in find-funct

* lisp/emacs-lisp/find-func.el (find-function-advised-original):
Handle new-style advice.  Return the symbol's function definition.
(Bug#20718)
(find-function-library): Update accordingly.

9 years agoMerge branch 'map'
Nicolas Petton [Thu, 4 Jun 2015 20:30:29 +0000 (22:30 +0200)]
Merge branch 'map'

9 years ago* lisp/emacs-lisp/map.el: Better docstring for the map pcase macro.
Nicolas Petton [Thu, 4 Jun 2015 20:26:22 +0000 (22:26 +0200)]
* lisp/emacs-lisp/map.el: Better docstring for the map pcase macro.

9 years ago; * etc/NEWS: Add string-greaterp
Nicolas Petton [Thu, 4 Jun 2015 16:31:49 +0000 (18:31 +0200)]
; * etc/NEWS: Add string-greaterp

9 years agoAdd new function string-greaterp
Nicolas Petton [Thu, 4 Jun 2015 16:20:18 +0000 (18:20 +0200)]
Add new function string-greaterp

* lisp/subr.el (string-greaterp): New function.  Also aliased to
`string>'.
* test/automated/subr-tests.el (string-comparison-test): Add unit
tests for `string>'and `string<'.
* src/fns.c (string-lessp): Better docstring.

9 years agoFix timezone-related functions on MS-Windows
Eli Zaretskii [Thu, 4 Jun 2015 15:28:29 +0000 (18:28 +0300)]
Fix timezone-related functions on MS-Windows

* src/editfns.c (set_time_zone_rule) [WINDOWSNT]: Always call
'xputenv', even if no reallocation of tzvalbuf was necessary.
This fixes a bug in timezone-related functions on MS-Windows.
Reported by Fabrice Popineau <fabrice.popineau@gmail.com>.

9 years agoDon't pass raw directory name to 'error'
Paul Eggert [Thu, 4 Jun 2015 00:18:59 +0000 (17:18 -0700)]
Don't pass raw directory name to 'error'

* lisp/files.el (basic-save-buffer-2): Avoid format error if
a directory name contains a string like "%s".

9 years agoOverride 'grep --color=always'
Dmitry Gutov [Wed, 3 Jun 2015 23:46:16 +0000 (02:46 +0300)]
Override 'grep --color=always'

* lisp/progmodes/xref.el (xref-collect-matches):
Override --color=always in grep-find-template.

9 years agoFix error introduced recently in file-notify-tests.el
Michael Albinus [Wed, 3 Jun 2015 18:03:42 +0000 (20:03 +0200)]
Fix error introduced recently in file-notify-tests.el

* test/automated/file-notify-tests.el
(file-notify--test-remote-enabled): Do not use `file-notify--test-desc'.
(file-notify--deftest-remote): Revert previous patch, not
necessary anymore.

9 years ago* src/indent.c (Fvertical_motion): Amend motion by 0 lines.
Wolfgang Jenkner [Wed, 3 Jun 2015 13:29:24 +0000 (15:29 +0200)]
* src/indent.c (Fvertical_motion): Amend motion by 0 lines.

Starting from a display string after a newline, point went to the
previous line.  Also, fix an inadvertent use of a buffer position
with FETCH_BYTE.  (Bug#20701)

9 years agoInstrument file-notify-test.el in order to catch hydra error.
Michael Albinus [Wed, 3 Jun 2015 12:07:06 +0000 (14:07 +0200)]
Instrument file-notify-test.el in order to catch hydra error.

* test/automated/file-notify-tests.el (file-notify--deftest-remote):
Wrap body by `ignore-case', in order to trap non-local errors.

9 years agoUndo previous changes in non-toolkit scroll bar drawing.
YAMAMOTO Mitsuharu [Wed, 3 Jun 2015 06:21:08 +0000 (15:21 +0900)]
Undo previous changes in non-toolkit scroll bar drawing.

* src/xterm.c (x_scroll_bar_set_handle, x_scroll_bar_expose)
[!USE_TOOLKIT_SCROLL_BARS]: Draw into scroll bar window.  (Bug#20668)

9 years ago* .gitignore: Also ignore doc/*/*/*.html and .ps.
Paul Eggert [Wed, 3 Jun 2015 05:51:49 +0000 (22:51 -0700)]
* .gitignore: Also ignore doc/*/*/*.html and .ps.

9 years agoSupport quotes 'like this' in info files
Paul Eggert [Wed, 3 Jun 2015 05:50:57 +0000 (22:50 -0700)]
Support quotes 'like this' in info files

This is possible when 'makeinfo --disable-encoding' is used
in Texinfo 5.
* lisp/calc/calc-help.el (calc-describe-thing):
* lisp/gnus/gnus-art.el (gnus-button-alist):
* lisp/info.el (Info-find-index-name):
* lisp/vc/ediff-help.el (ediff-help-for-quick-help):
Also support quotes 'like this'.
* lisp/calc/calc-help.el (calc-describe-thing): Simplify.
* lisp/finder.el (finder-font-lock-keywords): Remove var that
hasn't been used in years, instead of bothering to fix its quoting.

9 years ago* .gitignore: Remove !test/etags/html-src/*.html.
Paul Eggert [Wed, 3 Jun 2015 01:27:13 +0000 (18:27 -0700)]
* .gitignore: Remove !test/etags/html-src/*.html.

It's no longer needed, since *.html was removed.  Sort.

9 years agoRestore <D> instead of '.' in grep-find-template
Dmitry Gutov [Wed, 3 Jun 2015 02:44:48 +0000 (05:44 +0300)]
Restore <D> instead of '.' in grep-find-template

* lisp/cedet/semantic/symref/grep.el
(semantic-symref-grep-use-template): Update a comment.

* lisp/progmodes/grep.el (grep-compute-defaults): Restore <D>
instead of '.' in grep-find-template (bug#20719).
(rgrep): Pass nil as the directory to rgrep-default-command.

* lisp/progmodes/grep.el (grep-expand-keywords): Use '.' as the
default value for DIR.

* lisp/progmodes/xref.el (xref-collect-matches): Drop the
workaround.

9 years ago* configure.ac (emacs_config_features): Add X toolkit and scroll-bars.
Glenn Morris [Wed, 3 Jun 2015 01:25:11 +0000 (21:25 -0400)]
* configure.ac (emacs_config_features): Add X toolkit and scroll-bars.

9 years ago; * etc/NEWS: Tiny edit.
Glenn Morris [Wed, 3 Jun 2015 00:46:09 +0000 (20:46 -0400)]
; * etc/NEWS: Tiny edit.

9 years ago* configure.ac (emacs_config_features): Add Cairo.
Glenn Morris [Wed, 3 Jun 2015 00:22:35 +0000 (20:22 -0400)]
* configure.ac (emacs_config_features): Add Cairo.

9 years ago; * etc/NEWS: Add Cairo placeholder.
Glenn Morris [Wed, 3 Jun 2015 00:20:06 +0000 (20:20 -0400)]
; * etc/NEWS: Add Cairo placeholder.

9 years ago* configure.ac [HAVE_GTK3]: Remove USE_CAIRO that gets reset later.
Glenn Morris [Wed, 3 Jun 2015 00:19:06 +0000 (20:19 -0400)]
* configure.ac [HAVE_GTK3]: Remove USE_CAIRO that gets reset later.

9 years agoEnsure, that autorevert works for remote files in file-notify-tests.el
Michael Albinus [Tue, 2 Jun 2015 21:47:17 +0000 (23:47 +0200)]
Ensure, that autorevert works for remote files in file-notify-tests.el

* test/automated/file-notify-tests.el (file-notify--test-desc):
New defvar.
(file-notify--test-remote-enabled)
(file-notify-test00-availability, file-notify-test01-add-watch)
(file-notify-test02-events): Use it.
(file-notify--test-event-test): Check proper descriptor.
(file-notify-test03-autorevert): Ensure, that
`visited-file-modtime' has changed.

Fixes: debbugs:20392
9 years agoAdd a pcase pattern for maps and `map-let' based on it
Nicolas Petton [Tue, 2 Jun 2015 20:13:38 +0000 (22:13 +0200)]
Add a pcase pattern for maps and `map-let' based on it

* lisp/emacs-lisp/map.el (map-let): New macro.
(map--make-pcase-bindings, map--make-pcase-patterns): New functions.
* test/automated/map-tests.el: New test for `map-let'.

9 years agoReuse rgrep mechanics in xref-find-regexp
Dmitry Gutov [Tue, 2 Jun 2015 15:46:42 +0000 (18:46 +0300)]
Reuse rgrep mechanics in xref-find-regexp

* lisp/progmodes/grep.el (rgrep-default-command):
Extract from `rgrep'.

* lisp/progmodes/xref.el (xref-collect-references): Split from
`xref-collect-matches'.  Only handle the case of symbol search.
(xref-collect-matches): Instead of Semantic Symref, use
`rgrep-default-command', to take advantage of its directory and
file ignore settings.
(xref--collect-match): Remove the last argument, leaving the
regexp construction up to the caller.

* lisp/progmodes/elisp-mode.el (elisp--xref-find-matches):
Change to take the xref-collect- function to use as an argument.
(elisp-xref-find): Update accordingly.

* lisp/progmodes/etags.el (etags--xref-find-matches)
(etags-xref-find): Same.

9 years agoMove xref-elisp-location to elisp-mode.el
Dmitry Gutov [Mon, 1 Jun 2015 19:45:15 +0000 (22:45 +0300)]
Move xref-elisp-location to elisp-mode.el

* lisp/progmodes/xref.el (xref-elisp-location)
(xref-make-elisp-location, xref-location-marker): Remove here.
(xref--xref): Don't limit the type of the location slot.

* lisp/progmodes/elisp-mode.el (xref-elisp-location):
Define as a cl-struct here.
(xref-location-marker): Move here.

9 years agoMinor tweaks for .gitignore
Eli Zaretskii [Tue, 2 Jun 2015 15:27:28 +0000 (18:27 +0300)]
Minor tweaks for .gitignore

* .gitignore: Don't ignore versioned *.html and *.ps files.  Don't
ignore admin/notes/tags that might be ignored as TAGS on
case-insensitive filesystems.  (Bug#20710)

9 years agoGenerate curved quotes in ert doc
Paul Eggert [Tue, 2 Jun 2015 14:31:06 +0000 (07:31 -0700)]
Generate curved quotes in ert doc

* lisp/emacs-lisp/ert.el (ert--print-test-for-ewoc)
(ert-results-mode-menu)
(ert-results-pop-to-backtrace-for-test-at-point)
(ert-results-pop-to-messages-for-test-at-point)
(ert-results-pop-to-should-forms-for-test-at-point)
(ert-describe-test):
Quote ‘like this’, not `like this', when generating doc strings
and the like.
* test/automated/ert-x-tests.el (ert-test-describe-test):
Allow quoting ‘like this’.

9 years agoAdd test for previous commit
Nicolas Richard [Fri, 29 May 2015 08:33:35 +0000 (10:33 +0200)]
Add test for previous commit

* test/automated/replace-tests.el: New file.
(query-replace--split-string-tests): Add test for previous commit.

9 years agoAvoid confusion in query-replace history when replacing NUL chars
Nicolas Richard [Fri, 29 May 2015 08:32:05 +0000 (10:32 +0200)]
Avoid confusion in query-replace history when replacing NUL chars

* lisp/replace.el (query-replace--split-string): New function.
(query-replace-read-from): Rely on the 'separator' property
instead of searching for the NUL character (Bug#20690).

9 years agoMerge from origin/emacs-24
Glenn Morris [Tue, 2 Jun 2015 06:16:40 +0000 (23:16 -0700)]
Merge from origin/emacs-24

8b5f2f4 * doc/emacs/emacs.texi: Update the ISBN of the Emacs manual.

9 years ago; Merge from origin/emacs-24
Glenn Morris [Tue, 2 Jun 2015 06:16:39 +0000 (23:16 -0700)]
; Merge from origin/emacs-24

The following commits were skipped:

82e2ce9 Bump Emacs version to 24.5.50.
866501e * lisp/ChangeLog: Remove a duplicate
8272c1d lisp/ldefs-boot.el: Update for the 24.5 release
7cad9d5 Update the 24.5 release date in all ChangeLog files

9 years ago* admin/gitmerge.el (gitmerge-commit-message):
Glenn Morris [Tue, 2 Jun 2015 06:16:03 +0000 (23:16 -0700)]
* admin/gitmerge.el (gitmerge-commit-message):

Exclude "skipped" messages from ChangeLog.

9 years agoSync with Tramp repository
Michael Albinus [Mon, 1 Jun 2015 19:11:24 +0000 (21:11 +0200)]
Sync with Tramp repository

* lisp/net/tramp.el (tramp-message): Dump connection buffer error
messages.
(tramp-handle-make-auto-save-file-name): When calling
`make-auto-save-file-name' internally, make sure it uses Unix-like
behavior, not Windows-like behavior.

* lisp/net/tramp-sh.el (tramp-set-file-uid-gid): Add a timeout for
the local case, because "chown" might fail on w32.

* lisp/net/trampver.el (tramp-repository-get-version): Don't run
for XEmacs.

9 years agoMS-Windows followup for batch stdout/stderr output changes
Eli Zaretskii [Mon, 1 Jun 2015 15:17:28 +0000 (18:17 +0300)]
MS-Windows followup for batch stdout/stderr output changes

* lisp/international/mule-cmds.el (set-locale-environment): In
batch mode, use console codepages for keyboard and terminal
encoding.  (Bug#20545)

9 years agoUpdate .gitattributes for DOS EOL files
Eli Zaretskii [Mon, 1 Jun 2015 15:01:49 +0000 (18:01 +0300)]
Update .gitattributes for DOS EOL files

* .gitattributes: Use "whitespace=cr-at-eol" for files with DOS
CRLF end-of-line format.

9 years agoNS equivalents of xterm.c and w32term.c changes
Eli Zaretskii [Mon, 1 Jun 2015 14:46:20 +0000 (17:46 +0300)]
NS equivalents of xterm.c and w32term.c changes

* src/nsterm.m (ns_maybe_dumpglyphs_background): Force redraw of
glyph string background also when the font in use claims
preposterously large global height value.  Helps to remove
artifacts left from previous displays when glyphless characters
are displayed as hex code in a box.
(x_new_font): Call get_font_ascent_descent to obtain a reasonable
value for FRAME_LINE_HEIGHT, even when a font claims very large
value for its height.

9 years ago; Auto-commit of loaddefs files.
Glenn Morris [Mon, 1 Jun 2015 10:21:38 +0000 (06:21 -0400)]
; Auto-commit of loaddefs files.

9 years agoAvoid grave accent quoting in stderr diagnostics
Paul Eggert [Mon, 1 Jun 2015 06:52:09 +0000 (23:52 -0700)]
Avoid grave accent quoting in stderr diagnostics

A few Emacs diagnostics go directly to stderr, and so can't easily
contain curved quotes (as non-UTF-8 locales might mishandle them).
Instead of bothering to add support for this rarity, reword the
diagnostics so that they don't use grave accent to quote.
* src/alloc.c (mark_memory): Fix comment.
* src/buffer.c (init_buffer):
* src/dispnew.c (init_display):
* src/emacs.c (main, sort_args):
* src/lread.c (dir_warning):
* src/term.c (init_tty):
* src/unexmacosx.c (unexec):
* src/xfns.c (select_visual):
* src/xterm.c (cvt_string_to_pixel, x_io_error_quitter):
Reword stderr diagnostics to avoid quoting `like this'.
* src/unexmacosx.c: Include errno.h.
* src/xfns.c (select_visual): Encode value for locale.

9 years agoTreat batch stdout/stderr like standard display
Paul Eggert [Mon, 1 Jun 2015 03:04:05 +0000 (20:04 -0700)]
Treat batch stdout/stderr like standard display

Calls like (print FOO) could generate improperly encoded or
hard-to-read output if FOO contains characters outside the system
locale.  Fix this by treating batch stdout and stderr like
interactive standard display, when it comes to transliterating and
encoding characters (Bug#20545).
* doc/emacs/mule.texi (Communication Coding):
* doc/lispref/display.texi (Active Display Table):
* doc/lispref/nonascii.texi (Locales):
* etc/NEWS:
* src/coding.c (syms_of_coding):
* src/dispnew.c (syms_of_display):
Document this.
* src/print.c: Include disptab.h.
(printchar_to_stream): New function, with much of the guts of the
old Fexternal_debugging_output, except this one also uses the
standard display table.
(printchar, strout, Fexternal_debugging_output): Use it.

9 years ago* src/emacs.c (syms_of_emacs) <system-configuration-features>: Doc fix.
Glenn Morris [Sun, 31 May 2015 23:27:36 +0000 (16:27 -0700)]
* src/emacs.c (syms_of_emacs) <system-configuration-features>: Doc fix.

9 years agoRemove unused DEFSYMs
Paul Eggert [Sun, 31 May 2015 18:47:35 +0000 (11:47 -0700)]
Remove unused DEFSYMs

Remove DEFSYMs that aren't used at the C level.  Also:
* src/decompress.c (Qzlib_dll):
* src/font.c (Qunicode_sip):
* src/frame.c (Qtip_frame):
* src/ftfont.c (Qserif):
* src/gnutls.c (Qgnutls_dll):
* src/xml.c (Qlibxml2_dll):
Move from here ...
* src/w32fns.c (syms_of_w32fns): ... to here,
as these are used only on MS-Windows.

9 years agoAttempt to fix crashes due to accesses beyond glyph matrix end
Eli Zaretskii [Sun, 31 May 2015 14:41:35 +0000 (17:41 +0300)]
Attempt to fix crashes due to accesses beyond glyph matrix end

* src/xdisp.c (x_produce_glyphs): When it->ascent and it->descent
are determined from per-character metrics, don't let the
max_ascent and max_descent become smaller than values returned by
normal_char_ascent_descent, to avoid unpleasant dynamic resizing
of screen line heights when text changes.

* src/xterm.c (x_new_font)
* src/w32term.c (x_new_font): Call get_font_ascent_descent to
obtain a reasonable value for FRAME_LINE_HEIGHT, even when a font
claims very large value for its height.

* src/font.c (font_open_entity): Call get_font_ascent_descent to
obtain a reasonable value for FRAME_SMALLEST_FONT_HEIGHT, even
when a font claims very large value for its height.

9 years agoUse another default value for tramp-histfile-override
Michael Albinus [Sun, 31 May 2015 11:08:06 +0000 (13:08 +0200)]
Use another default value for tramp-histfile-override

* lisp/net/tramp-sh.el (tramp-histfile-override):
Use ".tramp_history" as default.

Fixes: debbugs:#20446
9 years ago; Auto-commit of ChangeLog files.
Glenn Morris [Sun, 31 May 2015 10:23:02 +0000 (06:23 -0400)]
; Auto-commit of ChangeLog files.

9 years agoMake sure there's no explicit tag name
Dmitry Gutov [Sun, 31 May 2015 00:55:30 +0000 (03:55 +0300)]
Make sure there's no explicit tag name

* lisp/progmodes/etags.el (tag-implicit-name-match-p): Make sure
there's no explicit tag name (bug#20629).

9 years agoRemove format2
Paul Eggert [Sat, 30 May 2015 22:29:41 +0000 (15:29 -0700)]
Remove format2

* src/editfns.c, src/lisp.h (format2): Remove.
It is more trouble than it's worth, now that we have CALLN.
This is just a minor refactoring.
* src/buffer.c (Fkill_buffer):
* src/dbusbind.c (XD_OBJECT_TO_STRING):
* src/fileio.c (barf_or_query_if_file_exists):
Adjust to format2 going away.

9 years agoDon't misencode C-generated messages
Paul Eggert [Sat, 30 May 2015 18:17:56 +0000 (11:17 -0700)]
Don't misencode C-generated messages

Also, be more consistent about calls to 'Fmessage' vs 'message'.
* src/alloc.c (Fgc_status):
Prefer AUTO_STRING to build_string for Fmessage call.
* src/data.c (Fmake_variable_buffer_local)
(Fmake_local_variable, Fmake_variable_frame_local):
* src/doc.c (store_function_docstring):
Use Fmessage, not message, since the argument can contain
non-ASCII characters, and this can cause the resulting message
to be incorrectly encoded for the current environment.
* src/fns.c (maybe_resize_hash_table):
* src/xselect.c (x_clipboard_manager_save_all):
Use message, not Fmessage, since Fmessage's power isn't needed here.
* src/process.c (Fmake_network_process): Reword message to avoid %s.
* src/xdisp.c (vmessage): Document restrictions on message contents.
(message_nolog) [false]: Remove unused code.

9 years agoUse \r rather than ^M in string literals
Paul Eggert [Sat, 30 May 2015 16:43:57 +0000 (09:43 -0700)]
Use \r rather than ^M in string literals

This is less likely to cause problems on platforms that
use CRLF (or CR!) termination for lines.

9 years agoUpdate .gitattributes to match current sources
Paul Eggert [Sat, 30 May 2015 16:33:41 +0000 (09:33 -0700)]
Update .gitattributes to match current sources

http://lists.gnu.org/archive/html/emacs-devel/2015-05/msg00879.html
* .gitattributes: Accommodate tests that insist on DOS format.
Remove test/automated/data/decompress/foo-gzipped.
Add etc/e/eterm-color.

9 years agoFix display of composite characters with large fonts
Eli Zaretskii [Sat, 30 May 2015 16:25:53 +0000 (19:25 +0300)]
Fix display of composite characters with large fonts

* src/xdisp.c (x_produce_glyphs): Call normal_char_ascent_descent
for reasonable values of font ascent and descent.
(get_font_ascent_descent): New function.

* src/composite.c (composition_gstring_width): Call
get_font_ascent_descent for reasonable values of font ascent and
descent.

* dispextern.h: Add prototype for get_font_ascent_descent.

9 years agoDocument 'face-ignored-fonts'
Eli Zaretskii [Sat, 30 May 2015 12:59:39 +0000 (15:59 +0300)]
Document 'face-ignored-fonts'

* doc/emacs/mule.texi (Modifying Fontsets): Document
face-ignored-fonts.  (Bug#20628)

9 years agoMerge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
Eli Zaretskii [Sat, 30 May 2015 12:02:51 +0000 (15:02 +0300)]
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

9 years agoAdd etags test for the new -Q option
Eli Zaretskii [Sat, 30 May 2015 12:01:49 +0000 (15:01 +0300)]
Add etags test for the new -Q option

* test/etags/ETAGS.good_1, test/etags/ETAGS.good_2:
* test/etags/ETAGS.good_3, test/etags/ETAGS.good_4:
* test/etags/ETAGS.good_5, test/etags/CTAGS.good: Adjust to
test-case changes below.
* test/etags/ETAGS.good_6: New file.

* test/etags/cp-src/x.cc: New file.
* test/etags/Makefile (CPSRC): Add x.cc.
(check): Add one more test, for -Q.

9 years agoUse list for the tags completion table, not obarray
Dmitry Gutov [Sat, 30 May 2015 11:35:55 +0000 (14:35 +0300)]
Use list for the tags completion table, not obarray

* lisp/progmodes/etags.el (etags-tags-completion-table): Return a
list instead of an obarray
(http://lists.gnu.org/archive/html/emacs-devel/2015-05/msg00876.html).
(tags-completion-table): Combine those lists.
(tags-completion-table): Update the docstring.

9 years agoRestore EOL format testing in etags
Eli Zaretskii [Sat, 30 May 2015 11:00:06 +0000 (14:00 +0300)]
Restore EOL format testing in etags

* test/etags/ETAGS.good_1, test/etags/ETAGS.good_2:
* test/etags/ETAGS.good_3, test/etags/ETAGS.good_4:
* test/etags/ETAGS.good_5, test/etags/CTAGS.good: Adjust to
test-case changes below.
* test/etags/html-src/algrthms.html: Convert back to DOS EOL format.
* test/etags/cp-src/c.C (B): Add back stray CR character.
* test/etags/c-src/dostorture.c: Add back.
* test/etags/Makefile (CSRC): Add back c-src/dostorture.c.

9 years agoDeclare Emacs on MS-Windows to be DPI-aware
Vitaly Takmazov [Sat, 30 May 2015 10:28:53 +0000 (13:28 +0300)]
Declare Emacs on MS-Windows to be DPI-aware

* nt/emacs-x86.manifest (asmv3:windowsSettings): Add dpiAware.
* nt/emacs-x64.manifest (asmv3:windowsSettings): Add dpiAware.
This avoids Windows entering compatibility mode for Emacs,
which causes fonts to look less nice.

Copyright-paperwork-exempt: yes

9 years agoImprove Tramp traces.
Michael Albinus [Sat, 30 May 2015 09:54:32 +0000 (11:54 +0200)]
Improve Tramp traces.

* lisp/net/trampver.el (tramp-repository-get-version): New defun.

* lisp/net/tramp.el (tramp-debug-message): Use it.