diff options
| -rw-r--r-- | lisp/ChangeLog | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4fc1e3c7ff8..65996aebfb1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -20,22 +20,15 @@ | |||
| 20 | 20 | ||
| 21 | 2011-11-16 Ken Manheimer <ken.manheimer@gmail.com> | 21 | 2011-11-16 Ken Manheimer <ken.manheimer@gmail.com> |
| 22 | 22 | ||
| 23 | * allout-widgets.el: (file metadata): Attribute copyright to FSF | 23 | * allout.el, allout-widgets.el (file metadata): Attribute copyright to |
| 24 | and collapse date sequence, obscure author/maintainer email | 24 | FSF and collapse date sequence, obscure author/maintainer email address |
| 25 | address better, remove extra version line, track relocation of | 25 | better, remove extra version line, track relocation of author's webpage. |
| 26 | author's allout webpage. | ||
| 27 | 26 | ||
| 28 | * allout.el: (file metadata): Attribute copyright to FSF | 27 | * progmodes/python.el (python-pdbtrack-input-prompt) |
| 29 | and collapse date sequence, obscure author/maintainer email | 28 | (python-pdbtrack-track-stack-file): Adjust to recognize ipdb as well as |
| 30 | address better, track relocation of author's allout webpage. | 29 | regular python pdb prompts. Adjustments shamelessly taken exactly as |
| 31 | 30 | suggested in EmacsWiki page (tiny change): | |
| 32 | 2011-11-16 Ken Manheimer <ken.manheimer@gmail.com> | 31 | http://www.emacswiki.org/PythonProgrammingInEmacs#toc14 |
| 33 | |||
| 34 | * python.el (python-pdbtrack-stack-entry-regexp) | ||
| 35 | (python-pdbtrack-input-prompt, python-pdbtrack-track-stack-file): | ||
| 36 | Adjust to recognize ipdb as well as regular python pdb prompts. | ||
| 37 | Adjustments shamelessly taken exactly as suggested in EmacsWiki | ||
| 38 | page: http://www.emacswiki.org/PythonProgrammingInEmacs#toc14 | ||
| 39 | 32 | ||
| 40 | 2011-11-16 Juanma Barranquero <lekktu@gmail.com> | 33 | 2011-11-16 Juanma Barranquero <lekktu@gmail.com> |
| 41 | 34 | ||
| @@ -86,7 +79,6 @@ | |||
| 86 | which wasn't being used. Add optional arg to force given state. | 79 | which wasn't being used. Add optional arg to force given state. |
| 87 | (rmail-mime): Add optional arg to force given state. | 80 | (rmail-mime): Add optional arg to force given state. |
| 88 | 81 | ||
| 89 | >>>>>>> MERGE-SOURCE | ||
| 90 | 2011-11-15 Juanma Barranquero <lekktu@gmail.com> | 82 | 2011-11-15 Juanma Barranquero <lekktu@gmail.com> |
| 91 | 83 | ||
| 92 | * allout.el (allout-encryption-plaintext-sanitization-regexps): | 84 | * allout.el (allout-encryption-plaintext-sanitization-regexps): |