[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100573: * lisp/emacs-lisp/lisp.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100573: * lisp/emacs-lisp/lisp.el (lisp-complete-symbol, lisp-completion-at-point): |
Date: |
Mon, 09 May 2011 12:17:05 -0300 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 100573
committer: Stefan Monnier <address@hidden>
branch nick: emacs-23
timestamp: Mon 2011-05-09 12:17:05 -0300
message:
* lisp/emacs-lisp/lisp.el (lisp-complete-symbol, lisp-completion-at-point):
Fix typo.
modified:
lisp/ChangeLog
lisp/emacs-lisp/lisp.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-05-08 18:29:35 +0000
+++ b/lisp/ChangeLog 2011-05-09 15:17:05 +0000
@@ -1,13 +1,18 @@
+2011-05-09 Stefan Monnier <address@hidden>
+
+ * emacs-lisp/lisp.el (lisp-complete-symbol, lisp-completion-at-point):
+ Fix typo.
+
2011-05-08 Ralph Schleicher <address@hidden>
- * progmodes/which-func.el (which-function): Use
- add-log-current-defun instead of add-log-current-defun-function,
+ * progmodes/which-func.el (which-function):
+ Use add-log-current-defun instead of add-log-current-defun-function,
which might not be defined (Bug#8260).
2011-04-25 Michael Albinus <address@hidden>
- * net/tramp.el (tramp-process-actions): Add POS argument. Delete
- region between POS and (pos).
+ * net/tramp.el (tramp-process-actions): Add POS argument.
+ Delete region between POS and (pos).
(tramp-do-copy-or-rename-file-out-of-band): Use `nil' position in
`tramp-process-actions' call.
(tramp-maybe-open-connection): Call `tramp-process-actions' with pos.
@@ -17,8 +22,8 @@
2011-04-24 Daniel Colascione <address@hidden>
- * progmodes/cc-engine.el (c-forward-decl-or-cast-1): Use
- correct match group (bug#8438).
+ * progmodes/cc-engine.el (c-forward-decl-or-cast-1):
+ Use correct match group (bug#8438).
2011-04-22 Juanma Barranquero <address@hidden>
@@ -92,13 +97,13 @@
2011-03-12 Michael Albinus <address@hidden>
- * net/tramp.el (tramp-progress-reporter-update): Use
- `tramp-compat-funcall'.
+ * net/tramp.el (tramp-progress-reporter-update):
+ Use `tramp-compat-funcall'.
(tramp-handle-start-file-process): Use `tramp-compat-process-get'.
(tramp-handle-insert-file-contents): Make `file-remote-p' call
compatible.
- (tramp-open-connection-setup-interactive-shell): Use
- `tramp-compat-process-put'.
+ (tramp-open-connection-setup-interactive-shell):
+ Use `tramp-compat-process-put'.
* net/tramp-compat.el (tramp-compat-process-get)
(tramp-compat-process-put): New defuns.
@@ -166,8 +171,8 @@
2011-02-18 Eli Zaretskii <address@hidden>
- * image-mode.el (image-toggle-display-image): Disable
- require-final-newline in buffers visiting binary image files.
+ * image-mode.el (image-toggle-display-image):
+ Disable require-final-newline in buffers visiting binary image files.
(Bug#8047)
* international/mule-cmds.el (read-char-by-name, ucs-insert):
@@ -186,8 +191,8 @@
2011-02-14 Chong Yidong <address@hidden>
- * pgg-gpg.el (pgg-gpg-process-region): Bind
- delete-by-moving-to-trash to nil.
+ * pgg-gpg.el (pgg-gpg-process-region):
+ Bind delete-by-moving-to-trash to nil.
* pgg-pgp.el (pgg-pgp-process-region, pgg-pgp-verify-region)
(pgg-pgp-snarf-keys-region):
@@ -201,8 +206,8 @@
2011-02-12 Chong Yidong <address@hidden>
* epg.el (epg-delete-output-file, epg-decrypt-string)
- (epg-verify-string, epg-sign-string, epg-encrypt-string): Bind
- delete-by-moving-to-trash to nil.
+ (epg-verify-string, epg-sign-string, epg-encrypt-string):
+ Bind delete-by-moving-to-trash to nil.
* epa-file.el (epa-file-insert-file-contents): Likewise.
@@ -3623,7 +3628,7 @@
(ada-goto-label-re): New; matches goto labels.
(ada-block-label-re): New; matches block labels.
(ada-label-re): New; matches both.
- (ada-named-block-re): Deleted; callers changed to use
+ (ada-named-block-re): Delete; callers changed to use
`ada-block-label-re' instead.
(ada-get-current-indent, ada-get-indent-noindent, ada-get-indent-loop):
Use `ada-block-label-re'.
@@ -11222,7 +11227,7 @@
(def-gdb-memory-format, def-gdb-memory-unit): Update memory buffer
after changing settings.
(gdb-invalidate-disassembly): Update when first shown.
- (gdb-edit-locals-value): Fixed.
+ (gdb-edit-locals-value): Fix.
(gdb-registers-handler-custom): Print registers in right order and
allow changing register values (only for current thread yet).
(gdb-breakpoints-mode-map): Don't assume threads buffer is present.
@@ -11273,7 +11278,7 @@
2009-08-06 Dmitry Dzhus <address@hidden>
- * progmodes/gdb-mi.el (gdb-var-create-regexp): Removed.
+ * progmodes/gdb-mi.el (gdb-var-create-regexp): Remove.
(gdb-var-create-handler): Rewritten using JSON parser.
(gdb-propertize-header): Move earlier.
(gdb-set-header): Remove to avoid duplication.
=== modified file 'lisp/emacs-lisp/lisp.el'
--- a/lisp/emacs-lisp/lisp.el 2011-01-02 23:50:46 +0000
+++ b/lisp/emacs-lisp/lisp.el 2011-05-09 15:17:05 +0000
@@ -624,7 +624,8 @@
(interactive)
(let* ((data (lisp-completion-at-point predicate))
(plist (nthcdr 3 data)))
- (let ((completion-annotate-function (plist-get plist :annotate-function)))
+ (let ((completion-annotate-function
+ (plist-get plist :annotation-function)))
(completion-in-region (nth 0 data) (nth 1 data) (nth 2 data)
(plist-get plist :predicate)))))
@@ -660,7 +661,7 @@
'fboundp))))))
(list beg end obarray
:predicate predicate
- :annotate-function
+ :annotation-function
(unless (eq predicate 'fboundp)
(lambda (str) (if (fboundp (intern-soft str)) " <f>")))))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-23 r100573: * lisp/emacs-lisp/lisp.el (lisp-complete-symbol, lisp-completion-at-point):,
Stefan Monnier <=