1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-25 07:28:20 +00:00
Commit Graph

120916 Commits

Author SHA1 Message Date
Glenn Morris
a4ff05a217 ChangeLog fix
No need to merge to trunk, since it corrects a backported entry that
should not appear in trunk.
2015-03-22 11:11:27 -07:00
Martin Rudalics
bb7b23c5cb In `debug' don't try using window on inaccessible frame (Bug#17170).
* emacs-lisp/debug.el (debug): Don't try using "previous"
window when its not live or on an invisible frame (Bug#17170).
2015-03-22 12:40:21 +01:00
Jan D
ae3d733360 Backport 20156 fix (stack corruption)
Fixes: debbugs:20156

* src/fontset.c (fontset_pattern_regexp): Backport: Replace + 1 with
+ 3 in alloca (tiny change)
2015-03-22 10:21:45 +01:00
Jan D
32315502e0 Fixes: debbugs:20156
* src/fontset.c (fontset_pattern_regexp): Replace + 1 with + 3 for
regexsize.
2015-03-22 10:14:36 +01:00
Eric Abrahamsen
6e1fac9bc7 lisp/gnus/{registry.el,gnus-registry.el}: Use slot names in references to object slot values 2015-03-21 23:59:30 +00:00
Eli Zaretskii
ad80180d0f Fix problems with setting system-time-locale on MS-Windows
src/emacs.c (synchronize_locale) [WINDOWSNT]: Ignore 'category' and
 always use LC_ALL instead.  Fixes problems with setting
 system-time-locale to something non-default.
2015-03-21 17:44:00 +02:00
Titus von der Malsburg
4a50af936e Add new functions for computing default font dimensions
lisp/window.el (window-font-width, window-font-height)
 (window-max-chars-per-line): New functions.
 lisp/simple.el (default-font-height): Doc fix.
 (default-font-width): New function.

 etc/NEWS: Mention `default-font-width', `window-font-height',
 `window-font-width', and `window-max-chars-per-line'.
2015-03-21 12:31:29 +02:00
Samer Masterson
70565a2176 Documentation and testing tips for CONTRIBUTE
CONTRIBUTE (Test your changes.): New section.
 (Document your changes.): Add doc tips.
2015-03-21 12:09:30 +02:00
Eli Zaretskii
e72edc05c3 Fix lisp/ChangeLog entry from last commit. 2015-03-21 12:04:39 +02:00
Mario Lang
17ad6f839e Fix problems caused by calling 'recenter' in auto-revert (Bug#20122)
lisp/emacs-lisp/tabulated-list.el (tabulated-list-print): Only call
 `recenter' if `current-buffer' is equal to `window-buffer'.

(cherry picked from commit 4a81602043)
2015-03-21 12:01:27 +02:00
Tassilo Horn
fa734d07ab Handle setf methods in elisp font-locking.
* emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-1): Also
recognize (cl-)defmethod with (setf method) name.
2015-03-21 08:52:34 +01:00
Tassilo Horn
73b8237c19 Fix CL function name font-lock bug.
* emacs-lisp/lisp-mode.el (lisp-cl-font-lock-keywords-1): Fix
false positive in function name font-locking.
2015-03-20 23:35:22 +01:00
Tassilo Horn
c9998fcbf4 Fix elisp function name font-lock bug.
* emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-1): Fix
false positive in function name font-locking.
2015-03-20 23:09:06 +01:00
Stefan Monnier
4cd31cf019 (cl-defsubst): Ignore false-positive occurrences of args via &cl-defs
Fixes: debbugs:20149

* lisp/emacs-lisp/cl-macs.el (cl-defsubst): Ignore false-positive
occurrences of args via &cl-defs.
2015-03-20 16:29:21 -04:00
Alan Mackenzie
932d0fdb4f Fix debbugs#20146
* font-lock.el (font-lock-extend-jit-lock-region-after-change):
Return the calculated values, as per spec.
2015-03-20 15:39:37 +00:00
Eric Abrahamsen
1fcc552ac2 lisp/gnus/registry.el (registry-prune): Allow registry to reach full size before pruning 2015-03-20 10:49:41 +00:00
Eric Abrahamsen
b8ea3aa9db lisp/gnus/registry.el (registry-collect-prune-candidates): Fix call to cl-subseq 2015-03-20 10:49:06 +00:00
Glenn Morris
395a76ad1c # ChangeLog fixes
Using eg add-change-log-entry-other-window, C-x 4 a, would avoid these issues
2015-03-19 23:02:28 -07:00
Dmitry Gutov
8142fc97af ruby-mode: Fix a "required arguments" confusion
* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Move `at_exit'
and `callcc' to the "methods with required arguments" section,
they need a block argument.  Remove a `throw' duplicate.
2015-03-20 07:03:54 +02:00
Dmitry Gutov
1c4900d953 Backport: ruby-mode: Detect regexps after `!'
Fixes: debbugs:19285

* lisp/progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Detect
regexps after `!'.

(cherry picked from commit 8854b9cf52)
2015-03-20 06:05:02 +02:00
Dmitry Gutov
f74843a7f1 Backport: ruby-mode: Change faces used for self, true, false and nil
Fixes: debbugs:17733

* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Use
`font-lock-constant-face' for nil, true and false.  Highlight
`self' as a keyword.

(cherry picked from commit e991af9228)
2015-03-20 06:04:54 +02:00
Nobuyoshi Nakada
a5d1f94fec Backport: ruby-mode: Expect regexp after { or | too
Fixes: debbugs:20026

* progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Expect
beginning of regexp also after open brace or vertical bar.

(cherry picked from commit dad0fc589c)
2015-03-20 06:04:36 +02:00
Paul Eggert
13eb26ad38 * configure.ac (_THREAD_SAFE): Simplify (Bug#20136). 2015-03-19 18:34:23 -07:00
Paul Eggert
a68aa2e15b Better port of pthread usage to FreeBSD
* configure.ac (ac_func_list): Omit pthread_sigmask, since
we check for that ourselves rather than relying on gnulib.
(HAVE_PTHREAD, LIB_PTHREAD, _THREAD_SAFE): Port better to FreeBSD,
by also checking for pthread_create, pthread_self, pthread_sigmask.
Tighten the test for pthread_atfork while we're at it.
Fixes: bug#20136
2015-03-19 14:18:30 -07:00
Vibhav Pant
3ffcf0e3de Call delete-backward-space interactively.
* lisp/progmodes/cperl-mode.el (cperl-electric-backspace):
 Call delete-backward-space interactively instead of delete-char.

* lisp/Changelog: Fix previous changelog.
2015-03-20 01:43:37 +05:30
Paul Eggert
ccf00107f7 Merge from gnulib
This incorporates:
2015-03-19 fdopendir: port better to MinGW
2015-03-18 fdopendir: fix typo in comment
2015-02-24 glob, etc.: port to MSVC v18 on MS-Windows 8.1
* lib/dirent.in.h, lib/fdopendir.c: Update from gnulib.
* lib/dirfd.c, m4/dirfd.m4: New files from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
2015-03-19 12:33:44 -07:00
Stefan Monnier
8aa13d07fe * lisp/emacs-lisp/pcase.el (pcase-lambda): Rewrite. 2015-03-19 13:46:36 -04:00
Stefan Monnier
29f7f98b7c Fixes: debbugs:20141
* lisp/emacs-lisp/eieio.el (object-slots): Return slot names as before.
2015-03-19 10:35:52 -04:00
Stefan Monnier
50c117fe86 EIEIO: Change class's representation to unify instance & class slots
* lisp/emacs-lisp/eieio-core.el (eieio--class): Change field names and order
to match those of cl--class; use cl--slot for both instance slots and
class slots.
(eieio--object-num-slots): Use cl-struct-slot-info.
(eieio--object-class): Rename from eieio--object-class-object.
(eieio--object-class-name): Remove.
(eieio-defclass-internal): Adjust to new slot representation.
Store doc in class rather than in `variable-documentation'.
(eieio--perform-slot-validation-for-default): Change API to take
a slot object.
(eieio--slot-override): New function.
(eieio--add-new-slot): Rewrite.
(eieio-copy-parents-into-subclass): Rewrite.
(eieio--validate-slot-value, eieio--validate-class-slot-value)
(eieio-oref-default, eieio-oset-default)
(eieio--class-slot-name-index, eieio-set-defaults): Adjust to new
slot representation.
(eieio--c3-merge-lists): Simplify.
(eieio--class/struct-parents): New function.
(eieio--class-precedence-bfs): Use it.

* lisp/emacs-lisp/eieio.el (with-slots): Use macroexp-let2.
(object-class-fast): Change recommend replacement.
(eieio-object-class): Rewrite.
(slot-exists-p): Adjust to new slot representation.
(initialize-instance): Adjust to new slot representation.
(object-write): Adjust to new slot representation.

* lisp/emacs-lisp/eieio-base.el (eieio-persistent-convert-list-to-object):
Manually map initargs to slot names.
(eieio-persistent-validate/fix-slot-value): Adjust to new
slot representation.

* lisp/emacs-lisp/eieio-compat.el (eieio--generic-static-symbol-specializers):
Extract from eieio--generic-static-symbol-generalizer.
(eieio--generic-static-symbol-generalizer): Use it.

* lisp/emacs-lisp/eieio-custom.el (eieio-object-value-create)
(eieio-object-value-get): Adjust to new slot representation.

* lisp/emacs-lisp/eieio-datadebug.el (data-debug/eieio-insert-slots):
Declare to silence warnings.
(data-debug-insert-object-button): Avoid `object-slots'.
(data-debug/eieio-insert-slots): Adjust to new slot representation.

* lisp/emacs-lisp/eieio-opt.el (eieio--help-print-slot): New function
extracted from eieio-help-class-slots.
(eieio-help-class-slots): Use it.  Adjust to new slot representation.

* test/automated/eieio-test-methodinvoke.el (make-instance): Use new-style
`subclass' specializer for a change.

* test/automated/eieio-test-persist.el (persist-test-save-and-compare):
Adjust to new slot representation.

* test/automated/eieio-tests.el (eieio-test-17-virtual-slot): Don't use
initarg in `oset'.
(eieio-test-32-slot-attribute-override-2): Adjust to new
slot representation.

* lisp/emacs-lisp/cl-preloaded.el (cl--class): Fix type of `parents'.
2015-03-18 23:02:26 -04:00
Vibhav Pant
f469024eea Use delete-char instead of delete-backward-char.
* lisp/leim/quail/hangul.el
* lisp/progmodes/cperl-mode.el: Use delete-char instead of
delete-backward-char, fixes compilation warnings.
2015-03-19 06:45:58 +05:30
Michael Albinus
611a4791a4 Mark apostrophs with ?/ instead of \037 in Tramp
Fixes: debbugs:20117

* net/tramp-sh.el (tramp-do-directory-files-and-attributes-with-stat):
Mark apostrophs with ?/ instead of \037.
2015-03-18 20:32:16 +01:00
Paul Eggert
81deba3d7a Merge from origin/emacs-24
1a941d6 Fix incorrect usage of @key in the User Manual  (Bug#20135)
14c47d3 doc/misc/efaq-w32.texi: Spell-check.
ac85901 doc/misc/efaq-w32.texi: Remove outdated information and update.
c43762d Fix description of fullscreen mode on MS-Windows (Bug#20110).
ea8cab3 doc/lispref/minibuf.texi (Basic Completion): Fix a typo.  (Bug#20108)
2fdec80 Improve indexing in Emacs manual  (Bug#20105)
cc11321 Fix --no-bitmap-icon

Conflicts:
	doc/emacs/ChangeLog
	doc/lispref/ChangeLog
	doc/misc/ChangeLog
	src/ChangeLog
2015-03-18 11:45:36 -07:00
Eli Zaretskii
1a941d6c9e Fix incorrect usage of @key in the User Manual (Bug#20135)
doc/emacs/misc.texi (Term Mode):
 doc/emacs/programs.texi (Basic Indent, Custom C Indent):
 doc/emacs/mini.texi (Minibuffer History):
 doc/emacs/text.texi (Org Mode):
 doc/emacs/display.texi (View Mode): Use @kbd where @key was mistakenly
 used.
2015-03-18 19:32:22 +02:00
Stefan Monnier
8dfff871bd * cl-generic.el (cl-generic-generalizers): Clean up after braindamage 2015-03-18 10:49:55 -04:00
Stefan Monnier
872481d9e2 Add classes as run-time descriptors of cl-structs.
* lisp/emacs-lisp/cl-preloaded.el (cl--struct-get-class): New function.
(cl--make-slot-desc): New constructor.
(cl--plist-remove, cl--struct-register-child): New functions.
(cl-struct-define): Rewrite.
(cl-structure-class, cl-structure-object, cl-slot-descriptor)
(cl--class): New structs.
(cl--struct-default-parent): Initialize it here.
* lisp/emacs-lisp/cl-macs.el (cl--find-class): New macro.
(cl-defsubst, cl--defsubst-expand, cl--sublis): Move before first use.
(cl--struct-default-parent): New var.
(cl-defstruct): Adjust to new representation of classes; add
default parent.  In accessors, signal `wrong-type-argument' rather than
a generic error.
(cl-struct-sequence-type, cl-struct-slot-info)
(cl-struct-slot-offset): Rewrite.
* lisp/emacs-lisp/cl-generic.el (cl--generic-struct-specializers)
(cl-generic-generalizers): Rewrite.
* src/alloc.c (purecopy): Handle hash-tables.

* lisp/emacs-lisp/debug.el (debug--implement-debug-on-entry):
Bind inhibit-debug-on-entry here...
(debug): Instead of here.

* lisp/emacs-lisp/macroexp.el (macroexp--debug-eager): New var.
(internal-macroexpand-for-load): Use it.

* lwlib/xlwmenu.c (pop_up_menu): Remove debugging code.
2015-03-18 10:31:07 -04:00
Dima Kogan
fd93edbb1c Have gud-display-line not display source buffer in gud window.
* lisp/progmodes/gud.el (gud-display-line): Make display-buffer
not reuse selected window.  (Bug#17675, Bug#19901, Bug#20034)
2015-03-18 08:15:54 +01:00
Tassilo Horn
9fdc166ee0 Improve dynamic elisp keyword font-locking
* emacs-lisp/byte-run.el (macro-declarations-alist): New
declaration no-font-lock-keyword.
(defmacro): Flush font-lock in existing elisp buffers.

* emacs-lisp/lisp-mode.el (lisp--el-update-after-load)
(lisp--el-update-macro-regexp, lisp--el-macro-regexp): Delete
functions and defconst.
(lisp--el-match-keyword): Rename from lisp--el-match-macro.
(lisp--el-font-lock-flush-elisp-buffers): New function.
(lisp-mode-variables): Remove code for updating
lisp--el-macro-regexp, and add
lisp--el-font-lock-flush-elisp-buffers to after-load-functions.
2015-03-18 07:44:01 +01:00
Paul Eggert
1a93b9145d * lisp/net/browse-url.el: Omit confusing documentation. 2015-03-17 20:55:34 -07:00
Paul Eggert
f9e354ebea Spelling and wording fixes 2015-03-17 17:11:14 -07:00
Paul Eggert
41278b775b Spacing and punctuation fixes 2015-03-17 16:56:21 -07:00
Simen Heggestøyl
7ec63a3afa Update CSS property list
* textmodes/css-mode.el (css-extract-keyword-list): Remove function in
favor of manual extraction.
(css-extract-parse-val-grammar): Remove function in favor of
manual extraction.
(css-extract-props-and-vals): Remove function in favor of manual
extraction.
(css-at-ids): Update list of CSS at-rule ids.
(css-property-ids): Update list of CSS properties.
2015-03-17 23:11:55 +01:00
Simen Heggestøyl
62fde9ee0f Add support for completion in `css-mode'
* textmodes/css-mode.el (css--complete-property): New function for
completing CSS properties.
(css--complete-pseudo-element-or-class): New function for
completing CSS pseudo-elements and pseudo-classes.
(css--complete-at-rule): New function for completing CSS at-rules.
(css-completion-at-point): New function providing completion for
`css-mode'.
(css-mode): Add support for completion.
2015-03-17 22:58:13 +01:00
Simen Heggestøyl
64db0c26fa Discriminate between pseudo-classes and -elements
* textmodes/css-mode.el (css--font-lock-keywords): Discriminate
between pseudo-classes and pseudo-elements.
(css-pseudo-ids): Remove.
(css-pseudo-class-ids): New variable.
(css-pseudo-element-ids): New variable.
2015-03-17 22:50:10 +01:00
Bozhidar Batsov
5b77d81840 Separate Kernel methods with required args from those without 2015-03-17 23:40:20 +02:00
Bozhidar Batsov
771978259e Font-lock more Kernel methods as built-in 2015-03-17 22:41:36 +02:00
Michael Albinus
7cf5b3748c Avoid leading tabs in shell scripts, sent by Tramp.
Fixes: debbugs:20118

* tramp-sh.el (tramp-maybe-send-script): Avoid leading tabs in
shell scripts.
2015-03-17 20:07:38 +01:00
Eli Zaretskii
e70a1f9b42 lisp/mouse.el: Fix last change. 2015-03-17 20:38:48 +02:00
Eli Zaretskii
0fe787e21c Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs 2015-03-17 20:32:04 +02:00
Stefan Monnier
6f73c465a8 * cl-macs.el (cl--transform-lambda): Refine last change.
Fixes: debbugs:20125

* test/automated/cl-lib-tests.el: Use lexical-binding.
(cl-lib-arglist-performance): Refine test to the case where one of the
fields has a non-nil default value.  Use existing `mystruct' defstruct.
(cl-lib-struct-accessors): Use `pcase' to be a bit more flexible in the
accepted outputs.
2015-03-17 14:30:42 -04:00
Eli Zaretskii
330cf1a717 Resurrect the lost optional fixed font menu on w32
lisp/mouse.el (mouse-appearance-menu): If w32-use-w32-font-dialog is
 nil, construct a menu of fixed fonts.  This resurrects a feature
 lost in Emacs 23.
 lisp/w32-vars.el (w32-use-w32-font-dialog): Add a ':set' function to
 reset mouse-appearance-menu-map, so the font dialog is recomputed
 the next time the menu is requested.
 (w32-fixed-font-alist): Fix to use correct names of Courier fonts.
2015-03-17 20:29:55 +02:00