diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-07-05 19:42:10 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-07-05 19:42:10 -0700 |
| commit | 322b7dab59b98b5d8625d2cd29e48f1ce605f769 (patch) | |
| tree | c08c912fba18085765e5601c228f52258b9d3d5a /lisp | |
| parent | 509542f35fb8e0ebba31ef8a0e7742ea5b3190b0 (diff) | |
| parent | 38fe4016d4ff317499eaf66b242e19db3da4a23f (diff) | |
| download | emacs-322b7dab59b98b5d8625d2cd29e48f1ce605f769.tar.gz | |
Merge from emacs-23; up to 2010-06-16T23:27:20Z!jay.p.belanger@gmail.com.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/info.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/gud.el | 3 | ||||
| -rw-r--r-- | lisp/window.el | 2 |
4 files changed, 14 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 32423da9afe..71efe9761aa 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2011-07-06 Markus Heiser <markus.heiser@darmarit.de> (tiny change) + + * progmodes/gud.el (gud-pdb-marker-regexp): Accept \r char (Bug#5653). + +2011-07-06 Chong Yidong <cyd@stupidchicken.com> + + * window.el (special-display-popup-frame): Doc fix (Bug#8853). + + * info.el (Info-directory-toc-nodes): Minor doc fix (Bug#8833). + 2011-07-05 Chong Yidong <cyd@stupidchicken.com> * button.el (button): Inherit from link face. Suggested by Dan diff --git a/lisp/info.el b/lisp/info.el index dca3df21d5c..047a1b340a0 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -2092,7 +2092,7 @@ If SAME-FILE is non-nil, do not move to a different Info file." )) (defun Info-directory-toc-nodes (filename) - "Directory-specific implementation of `Info-directory-toc-nodes'." + "Directory-specific implementation of `Info-toc-nodes'." `(,filename ("Top" nil nil nil))) diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 259ee81c9ba..a54d1438368 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -1581,7 +1581,8 @@ and source-file directory for your debugger." ;; Last group is for return value, e.g. "> test.py(2)foo()->None" ;; Either file or function name may be omitted: "> <string>(0)?()" (defvar gud-pdb-marker-regexp - "^> \\([-a-zA-Z0-9_/.:\\]*\\|<string>\\)(\\([0-9]+\\))\\([a-zA-Z0-9_]*\\|\\?\\|<module>\\)()\\(->[^\n]*\\)?\n") + "^> \\([-a-zA-Z0-9_/.:\\]*\\|<string>\\)(\\([0-9]+\\))\\([a-zA-Z0-9_]*\\|\\?\\|<module>\\)()\\(->[^\n\r]*\\)?[\n\r]") + (defvar gud-pdb-marker-regexp-file-group 1) (defvar gud-pdb-marker-regexp-line-group 2) (defvar gud-pdb-marker-regexp-fnname-group 3) diff --git a/lisp/window.el b/lisp/window.el index f8b7abbb2bf..37a3863ae08 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -6108,7 +6108,7 @@ BUFFER in a window on the selected frame. If ARGS is a list whose car is a symbol, use (car ARGS) as a function to do the work. Pass it BUFFER as first argument, -and (cdr ARGS) as second." +and (cdr ARGS) as the rest of the arguments." (if (and args (symbolp (car args))) (apply (car args) buffer (cdr args)) (let ((window (get-buffer-window buffer 0))) |