[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r118125: * lisp/emacs-lisp/eldoc.el (global-eldoc-mo
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] trunk r118125: * lisp/emacs-lisp/eldoc.el (global-eldoc-mode): Enable by default. |
Date: |
Wed, 15 Oct 2014 17:32:50 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 118125
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2014-10-15 13:32:41 -0400
message:
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): Enable by default.
Remove incorrect handling of eldoc-print-after-edit.
(eldoc-message-commands, eldoc-last-data): Use defvar.
* lisp/loadup.el (emacs-lisp/eldoc): Load it.
* src/lisp.mk (lisp): Add emacs-lisp/eldoc.elc.
modified:
etc/NEWS news-20141002041645-34n5fasbwydbo8t6-1
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/emacs-lisp/eldoc.el eldoc.el-20091113204419-o5vbwnq5f7feedwu-952
lisp/loadup.el loadup.el-20091113204419-o5vbwnq5f7feedwu-49
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/lisp.mk lisp.mk-20110520003707-7eka49p37u9mards-1
=== modified file 'etc/NEWS'
--- a/etc/NEWS 2014-10-14 18:10:37 +0000
+++ b/etc/NEWS 2014-10-15 17:32:41 +0000
@@ -103,6 +103,8 @@
* Editing Changes in Emacs 25.1
+** New minor mode global-eldoc-mode is enabled by default.
+
** Emacs now supports "bracketed paste mode" when running on a terminal
that supports it. This facility allows Emacs to understand pasted
chunks of text as strings to be inserted, instead of interpreting each
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-10-15 15:28:35 +0000
+++ b/lisp/ChangeLog 2014-10-15 17:32:41 +0000
@@ -1,5 +1,10 @@
2014-10-15 Stefan Monnier <address@hidden>
+ * emacs-lisp/eldoc.el (global-eldoc-mode): Enable by default.
+ Remove incorrect handling of eldoc-print-after-edit.
+ (eldoc-message-commands, eldoc-last-data): Use defvar.
+ * loadup.el (emacs-lisp/eldoc): Load it.
+
* progmodes/m4-mode.el (m4-syntax-propertize): New var.
(m4-mode): Use it.
(m4--quoted-p): New function.
=== modified file 'lisp/emacs-lisp/eldoc.el'
--- a/lisp/emacs-lisp/eldoc.el 2014-09-29 18:14:08 +0000
+++ b/lisp/emacs-lisp/eldoc.el 2014-10-15 17:32:41 +0000
@@ -47,9 +47,6 @@
;;; Code:
-(require 'help-fns) ;For fundoc-usage handling functions.
-(require 'cl-lib)
-
(defgroup eldoc nil
"Show function arglist or variable docstring in echo area."
:group 'lisp
@@ -129,7 +126,8 @@
this file since the obarray is initialized at load time.
Remember to keep it a prime number to improve hash performance.")
-(defconst eldoc-message-commands
+(defvar eldoc-message-commands
+ ;; Don't define as `defconst' since it would then go to (read-only)
purespace.
(make-vector eldoc-message-commands-table-size 0)
"Commands after which it is appropriate to print in the echo area.
ElDoc does not try to print function arglists, etc., after just any command,
@@ -140,12 +138,14 @@
directly. Instead, use `eldoc-add-command' and `eldoc-remove-command'.")
;; Not a constant.
-(defconst eldoc-last-data (make-vector 3 nil)
+(defvar eldoc-last-data (make-vector 3 nil)
+ ;; Don't define as `defconst' since it would then go to (read-only)
purespace.
"Bookkeeping; elements are as follows:
0 - contains the last symbol read from the buffer.
1 - contains the string last displayed in the echo area for variables,
or argument string for functions.
- 2 - 'function if function args, 'variable if variable documentation.")
+ 2 - `function' if function args, `variable' if variable documentation.")
+(make-obsolete-variable 'eldoc-last-data "use your own instead" "25.1")
(defvar eldoc-last-message nil)
@@ -203,14 +203,13 @@
(define-minor-mode global-eldoc-mode
"Enable `eldoc-mode' in all buffers where it's applicable."
:group 'eldoc :global t
+ :initialize 'custom-initialize-delay
+ :init-value t
(setq eldoc-last-message nil)
(if global-eldoc-mode
(progn
- (when eldoc-print-after-edit
- (setq-local eldoc-message-commands (eldoc-edit-message-commands)))
(add-hook 'post-command-hook #'eldoc-schedule-timer)
(add-hook 'pre-command-hook #'eldoc-pre-command-refresh-echo-area))
- (kill-local-variable 'eldoc-message-commands)
(remove-hook 'post-command-hook #'eldoc-schedule-timer)
(remove-hook 'pre-command-hook #'eldoc-pre-command-refresh-echo-area)))
=== modified file 'lisp/loadup.el'
--- a/lisp/loadup.el 2014-10-06 17:47:56 +0000
+++ b/lisp/loadup.el 2014-10-15 17:32:41 +0000
@@ -282,6 +282,7 @@
(load "vc/ediff-hook")
(load "uniquify")
(load "electric")
+(load "emacs-lisp/eldoc")
(if (not (eq system-type 'ms-dos)) (load "tooltip"))
;; This file doesn't exist when building a development version of Emacs
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-10-15 15:46:57 +0000
+++ b/src/ChangeLog 2014-10-15 17:32:41 +0000
@@ -1,18 +1,21 @@
+2014-10-15 Stefan Monnier <address@hidden>
+
+ * lisp.mk (lisp): Add emacs-lisp/eldoc.elc.
+
2014-10-15 Eli Zaretskii <address@hidden>
Update the bidirectional reordering engine for Unicode 6.3 and 7.0.
- * bidi.c (bidi_ignore_explicit_marks_for_paragraph_level): Remove
- variable.
- (bidi_get_type): Return the isolate initiators and terminator
- types.
+ * bidi.c (bidi_ignore_explicit_marks_for_paragraph_level):
+ Remove variable.
+ (bidi_get_type): Return the isolate initiators and terminator types.
(bidi_isolate_fmt_char, bidi_paired_bracket_type)
(bidi_fetch_char_skip_isolates, find_first_strong_char)
(bidi_find_bracket_pairs, bidi_resolve_brackets): New functions.
- (bidi_set_sos_type): Renamed from bidi_set_sor_type and updated
+ (bidi_set_sos_type): Rename from bidi_set_sor_type and updated
for the new features.
(bidi_push_embedding_level, bidi_pop_embedding_level): Update to
push and pop correctly for isolates.
- (bidi_remember_char): Modified to accept an additional argument
+ (bidi_remember_char): Modify to accept an additional argument
and record the bidi type according to its value.
(bidi_cache_iterator_state): Accept an additional argument to only
update an existing state. Handle the new members of struct bidi_it.
@@ -140,8 +143,8 @@
(ns_dumpglyphs_image, ns_check_menu_open)
(applicationDidFinishLaunching)
(antialiasThresholdDidChange:)
- (keyDown:, toggleFullScreen:, setPosition:portion:whole:): Remove
- checks for OSX <= 10.5/10.6.
+ (keyDown:, toggleFullScreen:, setPosition:portion:whole:):
+ Remove checks for OSX <= 10.5/10.6.
(changeFont:): Use macfont on COCOA, nsfont on GNUSTEP.
(syms_of_nsterm): Call syms_of_macfont on COCOA, syms_of_nsfont on
GNUSTEP.
@@ -166,8 +169,8 @@
(macfont_create_family_with_symbol)
(macfont_get_glyph_for_character)
(mac_font_get_glyphs_for_variants)
- (mac_ctfont_create_available_families, syms_of_macfont): Remove
- code for OSX < 10.6.
+ (mac_ctfont_create_available_families, syms_of_macfont):
+ Remove code for OSX < 10.6.
(mac_font_family_group, mac_font_family_compare): Remove, only used
for OSX < 10.6.
=== modified file 'src/lisp.mk'
--- a/src/lisp.mk 2014-10-06 17:47:56 +0000
+++ b/src/lisp.mk 2014-10-15 17:32:41 +0000
@@ -165,6 +165,7 @@
$(lispsource)/vc/vc-hooks.elc \
$(lispsource)/vc/ediff-hook.elc \
$(lispsource)/electric.elc \
+ $(lispsource)/emacs-lisp/eldoc.elc \
$(lispsource)/uniquify.elc \
$(lispsource)/tooltip.elc
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r118125: * lisp/emacs-lisp/eldoc.el (global-eldoc-mode): Enable by default.,
Stefan Monnier <=