aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-01-13 16:33:24 -0800
committerPaul Eggert2011-01-13 16:33:24 -0800
commit096d914f5d64f1606be8f6c2674c69c8de4eb5b3 (patch)
tree2fb30c9c3c418716ba9ac47d488a7360f730b3c2
parent193770eec942defa96c7ea310773b40534f709d1 (diff)
parent4d789d84b8d74fc01b83277fa9834bb9aa83642b (diff)
downloademacs-096d914f5d64f1606be8f6c2674c69c8de4eb5b3.tar.gz
emacs-096d914f5d64f1606be8f6c2674c69c8de4eb5b3.zip
Merge from mainline.
Diffstat
-rw-r--r--lisp/ChangeLog84
-rw-r--r--lisp/calculator.el212
-rw-r--r--lisp/cedet/ChangeLog70
-rw-r--r--lisp/cedet/semantic/symref/list.el5
-rw-r--r--lisp/cedet/srecode/srt-mode.el15
-rw-r--r--lisp/doc-view.el17
-rw-r--r--lisp/emacs-lisp/chart.el75
-rw-r--r--lisp/erc/ChangeLog19
-rw-r--r--lisp/erc/erc-dcc.el12
-rw-r--r--lisp/erc/erc.el22
-rw-r--r--lisp/mail/mail-utils.el73
-rw-r--r--lisp/net/rcirc.el5
-rw-r--r--lisp/org/ChangeLog1283
-rw-r--r--lisp/org/org-capture.el5
-rw-r--r--lisp/org/org-remember.el5
-rw-r--r--lisp/progmodes/prolog.el1025
-rw-r--r--lisp/recentf.el8
-rw-r--r--lisp/simple.el6
-rw-r--r--lisp/speedbar.el174
-rw-r--r--lisp/textmodes/reftex-index.el367
-rw-r--r--lisp/textmodes/reftex-sel.el197
-rw-r--r--lisp/textmodes/reftex-toc.el194
-rw-r--r--lisp/vc/ediff-mult.el3
-rw-r--r--lisp/vc/ediff-util.el3
-rw-r--r--test/ChangeLog6
-rw-r--r--test/indent/prolog.prolog17
26 files changed, 1957 insertions, 1945 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eafb096f499..617e3148fc1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,87 @@
12011-01-13 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 Use run-mode-hooks for major mode hooks (bug#513).
4 * textmodes/reftex-toc.el (reftex-toc-mode-map):
5 Rename from reftex-toc-map.
6 (reftex-toc-mode): Use define-derived-mode.
7 * textmodes/reftex-sel.el (reftex-select-shared-map): New map.
8 (reftex-select-label-mode-map, reftex-select-bib-mode-map):
9 Rename from reftex-select-(label|bib)-map. Move init into declaration.
10 (reftex-select-label-mode, reftex-select-bib-mode):
11 Use define-derived-mode.
12 * textmodes/reftex-index.el (reftex-index-phrases-mode-map)
13 (reftex-index-mode-map): Rename from reftex-index(-phrases)-map.
14 Move init into delcaration.
15 (reftex-index-mode, reftex-index-phrases-mode):
16 Use define-derived-mode.
17 * speedbar.el (speedbar-mode-syntax-table): Renaqme from
18 speedbar-syntax-table. Move init into declaration.
19 (speedbar-mode-map): Rename from speedbar-key-map.
20 Move init into declaration.
21 (speedbar-file-key-map): Move init into declaration.
22 (speedbar-mode): Use define-derived-mode.
23 * recentf.el (recentf-mode): Don't run hook (or message) redundantly.
24 * net/rcirc.el (rcirc-mode): Use run-mode-hooks.
25 * emacs-lisp/chart.el (chart-mode-map): Rename from chart-map.
26 (chart-face-list): Move initialization into declaration.
27 (chart-mode): Use define-derived-mode.
28 * calculator.el (calculator-mode-map): Move init into declaration.
29 (calculator-mode): Use define-derived-mode.
30
31 * mail/mail-utils.el (mail-strip-quoted-names): Make the regexp code
32 work for nested comments.
33
34 * progmodes/prolog.el: Use syntax-propertize. Further code cleanup.
35 (prolog-use-prolog-tokenizer-flag): Change default when
36 syntax-propertize can be used.
37 (prolog-syntax-propertize-function): New var.
38 (prolog-mode-variables): Move make-local-variable into `set'.
39 Don't make comment-column local since we don't set it.
40 Set comment-add (as it was in previous prolog.el). Use dolist.
41 Set syntax-propertize-function.
42 (prolog-mode, prolog-inferior-mode):
43 Call prolog(-inferior)-menu directly, not through the mode-hook.
44 (prolog-buffer-module, prolog-indent-level)
45 (prolog-paren-is-the-first-on-line-p, prolog-paren-balance)
46 (prolog-comment-limits, prolog-goto-comment-column):
47 Use line-(end|beginning)-position.
48 (prolog-build-prolog-command): Tighten up regexp.
49 (prolog-consult-compile): Move make-local-variable into `set'.
50 (prolog-consult-compile-filter, prolog-goto-next-paren)
51 (prolog-help-on-predicate, prolog-clause-info)
52 (prolog-mark-predicate): Don't let+setq.
53 (prolog-indent-line): Use indent-line-to.
54 Only call prolog-goto-comment-column if necessary.
55 (prolog-indent-level): Use bobp.
56 (prolog-first-pos-on-line): Remove, not used any more.
57 (prolog-in-string-or-comment): Use syntax-ppss if available.
58 (prolog-help-on-predicate): Use read-string.
59 (prolog-goto-predicate-info): Simplify.
60 (prolog-read-predicate): Use `default' rather than `initial'.
61 (prolog-temporary-file): Use make-temp-file to close a security hole.
62 (prolog-toggle-sicstus-sd): New command.
63 (prolog-electric-underscore, prolog-variables-to-anonymous):
64 Use dynamic-scoping as it was meant.
65 (prolog-menu): Move menu definitions to top-level.
66 Use a toggle-button for Sicstus's source debugger.
67 Change "Code" to the more usual "Prolog", and hence change "Prolog"
68 to "System".
69 (prolog-inferior-menu): Reuse prolog-menu's help menu.
70 Move other menu definition to top-level.
71
722011-01-13 Tassilo Horn <tassilo@member.fsf.org>
73
74 * doc-view.el (doc-view-open-text): Use meaningful text buffer
75 name. Keep original document's directory as default-directory
76 (bug#6446).
77 (doc-view-initiate-display): Fall back to normal mode when
78 doc-view-mode cannot be enabled, also when extracting the document
79 text into a separate buffer (bug#6446).
80
81 * simple.el (shell-command): Don't error out if shell command
82 buffer contains text with non-nil read-only property when erasing
83 the buffer.
84
12011-01-13 Kim F. Storm <storm@cua.dk> 852011-01-13 Kim F. Storm <storm@cua.dk>
2 86
3 * ido.el (ido-may-cache-directory): Move "too-big" check later. 87 * ido.el (ido-may-cache-directory): Move "too-big" check later.
diff --git a/lisp/calculator.el b/lisp/calculator.el
index d03b2082bdb..0a4e5d7ae66 100644
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -1,7 +1,7 @@
1;;; calculator.el --- a [not so] simple calculator for Emacs 1;;; calculator.el --- a [not so] simple calculator for Emacs
2 2
3;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 3;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
4;; 2008, 2009, 2010 Free Software Foundation, Inc. 4;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
5 5
6;; Author: Eli Barzilay <eli@barzilay.org> 6;; Author: Eli Barzilay <eli@barzilay.org>
7;; Keywords: tools, convenience 7;; Keywords: tools, convenience
@@ -382,10 +382,7 @@ Used for repeating operations in calculator-repR/L.")
382;;;--------------------------------------------------------------------- 382;;;---------------------------------------------------------------------
383;;; Key bindings 383;;; Key bindings
384 384
385(defvar calculator-mode-map nil 385(defvar calculator-mode-map
386 "The calculator key map.")
387
388(or calculator-mode-map
389 (let ((map (make-sparse-keymap))) 386 (let ((map (make-sparse-keymap)))
390 (suppress-keymap map t) 387 (suppress-keymap map t)
391 (define-key map "i" nil) 388 (define-key map "i" nil)
@@ -471,113 +468,114 @@ Used for repeating operations in calculator-repR/L.")
471 ("Binary" bin "B") 468 ("Binary" bin "B")
472 ("Octal" oct "O") 469 ("Octal" oct "O")
473 ("Hexadecimal" hex "H")))) 470 ("Hexadecimal" hex "H"))))
474 (op '(lambda (name key) 471 (op (lambda (name key)
475 `[,name (calculator-op ,key) :keys ,key]))) 472 `[,name (calculator-op ,key) :keys ,key])))
476 (easy-menu-define 473 (easy-menu-define
477 calculator-menu map "Calculator menu." 474 calculator-menu map "Calculator menu."
478 `("Calculator" 475 `("Calculator"
479 ["Help" 476 ["Help"
480 (let ((last-command 'calculator-help)) (calculator-help)) 477 (let ((last-command 'calculator-help)) (calculator-help))
481 :keys "?"] 478 :keys "?"]
482 "---"
483 ["Copy" calculator-copy]
484 ["Paste" calculator-paste]
485 "---"
486 ["Electric mode"
487 (progn (calculator-quit)
488 (setq calculator-restart-other-mode t)
489 (run-with-timer 0.1 nil '(lambda () (message nil)))
490 ;; the message from the menu will be visible,
491 ;; couldn't make it go away...
492 (calculator))
493 :active (not calculator-electric-mode)]
494 ["Normal mode"
495 (progn (setq calculator-restart-other-mode t)
496 (calculator-quit))
497 :active calculator-electric-mode]
498 "---"
499 ("Functions"
500 ,(funcall op "Repeat-right" ">")
501 ,(funcall op "Repeat-left" "<")
502 "------General------"
503 ,(funcall op "Reciprocal" ";")
504 ,(funcall op "Log" "L")
505 ,(funcall op "Square-root" "Q")
506 ,(funcall op "Factorial" "!")
507 "------Trigonometric------"
508 ,(funcall op "Sinus" "S")
509 ,(funcall op "Cosine" "C")
510 ,(funcall op "Tangent" "T")
511 ,(funcall op "Inv-Sinus" "IS")
512 ,(funcall op "Inv-Cosine" "IC")
513 ,(funcall op "Inv-Tangent" "IT")
514 "------Bitwise------"
515 ,(funcall op "Or" "|")
516 ,(funcall op "Xor" "#")
517 ,(funcall op "And" "&")
518 ,(funcall op "Not" "~"))
519 ("Saved List"
520 ["Eval+Save" calculator-save-on-list]
521 ["Prev number" calculator-saved-up]
522 ["Next number" calculator-saved-down]
523 ["Delete current" calculator-clear
524 :active (and calculator-display-fragile
525 calculator-saved-list
526 (= (car calculator-stack)
527 (nth calculator-saved-ptr
528 calculator-saved-list)))]
529 ["Delete all" calculator-clear-saved]
530 "---" 479 "---"
531 ,(funcall op "List-total" "l") 480 ["Copy" calculator-copy]
532 ,(funcall op "List-average" "v")) 481 ["Paste" calculator-paste]
533 ("Registers"
534 ["Get register" calculator-get-register]
535 ["Set register" calculator-set-register])
536 ("Modes"
537 ["Radians"
538 (progn
539 (and (or calculator-input-radix calculator-output-radix)
540 (calculator-radix-mode "D"))
541 (and calculator-deg (calculator-dec/deg-mode)))
542 :keys "D"
543 :style radio
544 :selected (not (or calculator-input-radix
545 calculator-output-radix
546 calculator-deg))]
547 ["Degrees"
548 (progn
549 (and (or calculator-input-radix calculator-output-radix)
550 (calculator-radix-mode "D"))
551 (or calculator-deg (calculator-dec/deg-mode)))
552 :keys "D"
553 :style radio
554 :selected (and calculator-deg
555 (not (or calculator-input-radix
556 calculator-output-radix)))]
557 "---" 482 "---"
558 ,@(mapcar 'car radix-selectors) 483 ["Electric mode"
559 ("Separate I/O" 484 (progn (calculator-quit)
560 ,@(mapcar (lambda (x) (nth 1 x)) radix-selectors) 485 (setq calculator-restart-other-mode t)
486 (run-with-timer 0.1 nil '(lambda () (message nil)))
487 ;; the message from the menu will be visible,
488 ;; couldn't make it go away...
489 (calculator))
490 :active (not calculator-electric-mode)]
491 ["Normal mode"
492 (progn (setq calculator-restart-other-mode t)
493 (calculator-quit))
494 :active calculator-electric-mode]
495 "---"
496 ("Functions"
497 ,(funcall op "Repeat-right" ">")
498 ,(funcall op "Repeat-left" "<")
499 "------General------"
500 ,(funcall op "Reciprocal" ";")
501 ,(funcall op "Log" "L")
502 ,(funcall op "Square-root" "Q")
503 ,(funcall op "Factorial" "!")
504 "------Trigonometric------"
505 ,(funcall op "Sinus" "S")
506 ,(funcall op "Cosine" "C")
507 ,(funcall op "Tangent" "T")
508 ,(funcall op "Inv-Sinus" "IS")
509 ,(funcall op "Inv-Cosine" "IC")
510 ,(funcall op "Inv-Tangent" "IT")
511 "------Bitwise------"
512 ,(funcall op "Or" "|")
513 ,(funcall op "Xor" "#")
514 ,(funcall op "And" "&")
515 ,(funcall op "Not" "~"))
516 ("Saved List"
517 ["Eval+Save" calculator-save-on-list]
518 ["Prev number" calculator-saved-up]
519 ["Next number" calculator-saved-down]
520 ["Delete current" calculator-clear
521 :active (and calculator-display-fragile
522 calculator-saved-list
523 (= (car calculator-stack)
524 (nth calculator-saved-ptr
525 calculator-saved-list)))]
526 ["Delete all" calculator-clear-saved]
527 "---"
528 ,(funcall op "List-total" "l")
529 ,(funcall op "List-average" "v"))
530 ("Registers"
531 ["Get register" calculator-get-register]
532 ["Set register" calculator-set-register])
533 ("Modes"
534 ["Radians"
535 (progn
536 (and (or calculator-input-radix calculator-output-radix)
537 (calculator-radix-mode "D"))
538 (and calculator-deg (calculator-dec/deg-mode)))
539 :keys "D"
540 :style radio
541 :selected (not (or calculator-input-radix
542 calculator-output-radix
543 calculator-deg))]
544 ["Degrees"
545 (progn
546 (and (or calculator-input-radix calculator-output-radix)
547 (calculator-radix-mode "D"))
548 (or calculator-deg (calculator-dec/deg-mode)))
549 :keys "D"
550 :style radio
551 :selected (and calculator-deg
552 (not (or calculator-input-radix
553 calculator-output-radix)))]
561 "---" 554 "---"
562 ,@(mapcar (lambda (x) (nth 2 x)) radix-selectors))) 555 ,@(mapcar 'car radix-selectors)
563 ("Decimal Display" 556 ("Separate I/O"
564 ,@(mapcar (lambda (d) 557 ,@(mapcar (lambda (x) (nth 1 x)) radix-selectors)
565 (vector (cadr d) 558 "---"
566 ;; Note: inserts actual object here 559 ,@(mapcar (lambda (x) (nth 2 x)) radix-selectors)))
567 `(calculator-rotate-displayer ',d))) 560 ("Decimal Display"
568 calculator-displayers) 561 ,@(mapcar (lambda (d)
562 (vector (cadr d)
563 ;; Note: inserts actual object here
564 `(calculator-rotate-displayer ',d)))
565 calculator-displayers)
566 "---"
567 ["Change Prev Display" calculator-displayer-prev]
568 ["Change Next Display" calculator-displayer-next])
569 "---" 569 "---"
570 ["Change Prev Display" calculator-displayer-prev] 570 ["Copy+Quit" calculator-save-and-quit]
571 ["Change Next Display" calculator-displayer-next]) 571 ["Quit" calculator-quit]))))
572 "---" 572 map)
573 ["Copy+Quit" calculator-save-and-quit] 573 "The calculator key map.")
574 ["Quit" calculator-quit]))))
575 (setq calculator-mode-map map)))
576 574
577;;;--------------------------------------------------------------------- 575;;;---------------------------------------------------------------------
578;;; Startup and mode stuff 576;;; Startup and mode stuff
579 577
580(defun calculator-mode () 578(define-derived-mode calculator-mode fundamental-mode "Calculator"
581 ;; this help is also used as the major help screen 579 ;; this help is also used as the major help screen
582 "A [not so] simple calculator for Emacs. 580 "A [not so] simple calculator for Emacs.
583 581
@@ -671,13 +669,7 @@ Some interesting customization variables are:
671See the documentation for these variables, and \"calculator.el\" for 669See the documentation for these variables, and \"calculator.el\" for
672more information. 670more information.
673 671
674\\{calculator-mode-map}" 672\\{calculator-mode-map}")
675 (interactive)
676 (kill-all-local-variables)
677 (setq major-mode 'calculator-mode)
678 (setq mode-name "Calculator")
679 (use-local-map calculator-mode-map)
680 (run-mode-hooks 'calculator-mode-hook))
681 673
682(eval-when-compile (require 'electric) (require 'ehelp)) 674(eval-when-compile (require 'electric) (require 'ehelp))
683 675
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index efe7e4d4255..c25294ca5a7 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,9 @@
12011-01-13 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * srecode/srt-mode.el (srecode-template-mode): Use define-derived-mode.
4 * semantic/symref/list.el (semantic-symref-results-mode):
5 Use run-mode-hooks.
6
12010-11-12 Glenn Morris <rgm@gnu.org> 72010-11-12 Glenn Morris <rgm@gnu.org>
2 8
3 * semantic/wisent/comp.el: Remove unnecessary eval-when-compiles. 9 * semantic/wisent/comp.el: Remove unnecessary eval-when-compiles.
@@ -60,8 +66,8 @@
60 * semantic/db-typecache.el (semanticdb-typecache-find-default): 66 * semantic/db-typecache.el (semanticdb-typecache-find-default):
61 * semantic/imenu.el (semantic-create-imenu-index): 67 * semantic/imenu.el (semantic-create-imenu-index):
62 * semantic/grammar.el (semantic--grammar-macro-function-tag): 68 * semantic/grammar.el (semantic--grammar-macro-function-tag):
63 * semantic/fw.el (semanticdb-without-unloaded-file-searches): Fix 69 * semantic/fw.el (semanticdb-without-unloaded-file-searches):
64 require. Suggested by David Engster. 70 Fix require. Suggested by David Engster.
65 71
66 * semantic/bovine/c-by.el: Regenerate. 72 * semantic/bovine/c-by.el: Regenerate.
67 73
@@ -105,8 +111,8 @@
105 * srecode/texi.el (srecode-texi-insert-tag-as-doc): New function. 111 * srecode/texi.el (srecode-texi-insert-tag-as-doc): New function.
106 (semantic-insert-foreign-tag): Use it. 112 (semantic-insert-foreign-tag): Use it.
107 113
108 * srecode/mode.el (srecode-bind-insert): Call 114 * srecode/mode.el (srecode-bind-insert):
109 srecode-load-tables-for-mode. 115 Call srecode-load-tables-for-mode.
110 (srecode-minor-mode-templates-menu): Do not list templates that 116 (srecode-minor-mode-templates-menu): Do not list templates that
111 are not in the current project. 117 are not in the current project.
112 (srecode-menu-bar): Add binding for srecode-macro-help. 118 (srecode-menu-bar): Add binding for srecode-macro-help.
@@ -159,8 +165,8 @@
159 compare of built-in templates. Give built-ins lower piority. 165 compare of built-in templates. Give built-ins lower piority.
160 Support special variable "project". 166 Support special variable "project".
161 (srecode-compile-template-table): Set :project slot of new tables. 167 (srecode-compile-template-table): Set :project slot of new tables.
162 (srecode-compile-one-template-tag): Use 168 (srecode-compile-one-template-tag):
163 srecode-create-dictionaries-from-tags. 169 Use srecode-create-dictionaries-from-tags.
164 170
1652010-09-21 Eric Ludlam <zappo@gnu.org> 1712010-09-21 Eric Ludlam <zappo@gnu.org>
166 172
@@ -210,8 +216,8 @@
210 (autoconf-new-automake-string): Deleted. 216 (autoconf-new-automake-string): Deleted.
211 (autoconf-new-program): Use SRecode to fill an empty file. 217 (autoconf-new-program): Use SRecode to fill an empty file.
212 218
213 * ede/cpp-root.el (ede-create-lots-of-projects-under-dir): New 219 * ede/cpp-root.el (ede-create-lots-of-projects-under-dir):
214 function. 220 New function.
215 221
216 * ede/files.el (ede-flush-project-hash): New command. 222 * ede/files.el (ede-flush-project-hash): New command.
217 (ede-convert-path): Add optional PROJECT arg. 223 (ede-convert-path): Add optional PROJECT arg.
@@ -232,8 +238,8 @@
232 list whether or not the vars are already in the Makefile. 238 list whether or not the vars are already in the Makefile.
233 (ede-pmake-insert-variable-once): New macro. 239 (ede-pmake-insert-variable-once): New macro.
234 240
235 * ede/project-am.el (project-am-with-makefile-current): Add 241 * ede/project-am.el (project-am-with-makefile-current):
236 recentf-exclude. 242 Add recentf-exclude.
237 (project-am-load-makefile): Obey an optional suggested name. 243 (project-am-load-makefile): Obey an optional suggested name.
238 (project-am-expand-subdirlist): New function. 244 (project-am-expand-subdirlist): New function.
239 (project-am-makefile::project-rescan): Use it. Combine SUBDIRS 245 (project-am-makefile::project-rescan): Use it. Combine SUBDIRS
@@ -248,16 +254,16 @@
248 (project-am-extract-package-info): Fix separators. 254 (project-am-extract-package-info): Fix separators.
249 255
250 * ede/proj.el (project-run-target): New method. 256 * ede/proj.el (project-run-target): New method.
251 (project-make-dist, project-compile-project): Use 257 (project-make-dist, project-compile-project):
252 ede-proj-automake-p to determine which kind of compile to use. 258 Use ede-proj-automake-p to determine which kind of compile to use.
253 (project-rescan): Call ede-load-project-file. 259 (project-rescan): Call ede-load-project-file.
254 (ede-buffer-mine): Add more file names that belong to the project. 260 (ede-buffer-mine): Add more file names that belong to the project.
255 (ede-proj-compilers): Improve error message. 261 (ede-proj-compilers): Improve error message.
256 262
257 * ede/proj-obj.el (ede-ld-linker): Use the LDDEPS variable. 263 * ede/proj-obj.el (ede-ld-linker): Use the LDDEPS variable.
258 (ede-source-c++): Add more C++ extensions. 264 (ede-source-c++): Add more C++ extensions.
259 (ede-proj-target-makefile-objectcode): Quote initforms. Support 265 (ede-proj-target-makefile-objectcode): Quote initforms.
260 lex and yacc. 266 Support lex and yacc.
261 267
262 * ede/proj-prog.el (ede-proj-makefile-insert-rules): Removed. 268 * ede/proj-prog.el (ede-proj-makefile-insert-rules): Removed.
263 (ede-proj-makefile-insert-variables): New, add LDDEPS. 269 (ede-proj-makefile-insert-variables): New, add LDDEPS.
@@ -267,8 +273,8 @@
267 they show up in the same order as in the command line. 273 they show up in the same order as in the command line.
268 (ede-proj-target-makefile-program): Add ldlibs-local slot. 274 (ede-proj-target-makefile-program): Add ldlibs-local slot.
269 275
270 * ede/proj-shared.el (ede-g++-libtool-shared-compiler): Fix 276 * ede/proj-shared.el (ede-g++-libtool-shared-compiler):
271 inference rule to use cpp files. 277 Fix inference rule to use cpp files.
272 (ede-proj-target-makefile-shared-object): Quote initforms. 278 (ede-proj-target-makefile-shared-object): Quote initforms.
273 279
274 * ede/proj-misc.el (ede-proj-target-makefile-miscelaneous): 280 * ede/proj-misc.el (ede-proj-target-makefile-miscelaneous):
@@ -327,8 +333,8 @@
327 (semantic-analyze-scoped-inherited-tag-map): Take the tag we are 333 (semantic-analyze-scoped-inherited-tag-map): Take the tag we are
328 looking for as part of the scoped tags list. 334 looking for as part of the scoped tags list.
329 335
330 * semantic/html.el (semantic-default-html-setup): Add 336 * semantic/html.el (semantic-default-html-setup):
331 senator-step-at-tag-classes. 337 Add senator-step-at-tag-classes.
332 338
333 * semantic/decorate/include.el 339 * semantic/decorate/include.el
334 (semantic-decoration-on-unknown-includes): Change light bgcolor. 340 (semantic-decoration-on-unknown-includes): Change light bgcolor.
@@ -355,8 +361,8 @@
355 * semantic/util.el (semantic-hack-search) 361 * semantic/util.el (semantic-hack-search)
356 (semantic-recursive-find-nonterminal-by-name) 362 (semantic-recursive-find-nonterminal-by-name)
357 (semantic-current-tag-interactive): Deleted. 363 (semantic-current-tag-interactive): Deleted.
358 (semantic-describe-buffer): Fix expand-nonterminal. Add 364 (semantic-describe-buffer): Fix expand-nonterminal.
359 lex-syntax-mods, type relation separator char, and command 365 Add lex-syntax-mods, type relation separator char, and command
360 separation char. 366 separation char.
361 (semantic-sanity-check): Only message if called interactively. 367 (semantic-sanity-check): Only message if called interactively.
362 368
@@ -372,8 +378,8 @@
372 * semantic/idle.el: Add breadcrumbs support. 378 * semantic/idle.el: Add breadcrumbs support.
373 (semantic-idle-summary-current-symbol-info-default) 379 (semantic-idle-summary-current-symbol-info-default)
374 (semantic-idle-tag-highlight) 380 (semantic-idle-tag-highlight)
375 (semantic-idle-completion-list-default): Use 381 (semantic-idle-completion-list-default):
376 semanticdb-without-unloaded-file-searches for speed, and to 382 Use semanticdb-without-unloaded-file-searches for speed, and to
377 conform to the controls that specify if the idle timer is supposed 383 conform to the controls that specify if the idle timer is supposed
378 to be parsing unparsed includes. 384 to be parsing unparsed includes.
379 (semantic-idle-symbol-highlight-face) 385 (semantic-idle-symbol-highlight-face)
@@ -448,8 +454,8 @@
448 (semantic-analyze-find-tag-sequence-default): Be robust to 454 (semantic-analyze-find-tag-sequence-default): Be robust to
449 calculated scopes being nil. 455 calculated scopes being nil.
450 456
451 * semantic/bovine/c.el (semantic-c-describe-environment): Add 457 * semantic/bovine/c.el (semantic-c-describe-environment):
452 project macro symbol array. 458 Add project macro symbol array.
453 (semantic-c-parse-lexical-token): Add recursion limit. 459 (semantic-c-parse-lexical-token): Add recursion limit.
454 (semantic-ctxt-imported-packages, semanticdb-expand-nested-tag): 460 (semantic-ctxt-imported-packages, semanticdb-expand-nested-tag):
455 New overrides. 461 New overrides.
@@ -458,8 +464,8 @@
458 (semantic-expand-c-tag-namelist): Do not split out a typedef'd 464 (semantic-expand-c-tag-namelist): Do not split out a typedef'd
459 inline type if it is an anonymous type. 465 inline type if it is an anonymous type.
460 (semantic-c-reconstitute-token): Use the optional initializers as 466 (semantic-c-reconstitute-token): Use the optional initializers as
461 a clue that some function is probably a constructor. When 467 a clue that some function is probably a constructor.
462 defining the type of these constructors, split the parent name, 468 When defining the type of these constructors, split the parent name,
463 and use only the class part, if applicable. 469 and use only the class part, if applicable.
464 470
465 * semantic/bovine/c-by.el: 471 * semantic/bovine/c-by.el:
@@ -594,8 +600,8 @@
594 600
595 * semantic/db-find.el 601 * semantic/db-find.el
596 (semanticdb-find-translate-path-brutish-default): 602 (semanticdb-find-translate-path-brutish-default):
597 * ede/make.el (ede-make-check-version): Use 603 * ede/make.el (ede-make-check-version):
598 with-current-buffer instead of save-excursion. 604 Use with-current-buffer instead of save-excursion.
599 605
6002010-02-24 Eduard Wiebe <usenet@pusto.de> 6062010-02-24 Eduard Wiebe <usenet@pusto.de>
601 607
@@ -783,8 +789,8 @@
783 * ede.el (ede-apply-preprocessor-map): Accept lists of 789 * ede.el (ede-apply-preprocessor-map): Accept lists of
784 ede-objects as targets. 790 ede-objects as targets.
785 791
786 * ede/pmake.el (ede-proj-makefile-insert-variables): Output 792 * ede/pmake.el (ede-proj-makefile-insert-variables):
787 a target's object list even if compiler vars are already in the 793 Output a target's object list even if compiler vars are already in the
788 Makefile. 794 Makefile.
789 795
790 * ede/emacs.el (ede-preprocessor-map): Add config.h to the 796 * ede/emacs.el (ede-preprocessor-map): Add config.h to the
@@ -880,8 +886,8 @@
880 886
8812009-11-08 Chong Yidong <cyd@stupidchicken.com> 8872009-11-08 Chong Yidong <cyd@stupidchicken.com>
882 888
883 * semantic/ctxt.el (semantic-get-local-variables): Disable 889 * semantic/ctxt.el (semantic-get-local-variables):
884 the progress reporter entirely. 890 Disable the progress reporter entirely.
885 891
8862009-11-03 Stefan Monnier <monnier@iro.umontreal.ca> 8922009-11-03 Stefan Monnier <monnier@iro.umontreal.ca>
887 893
diff --git a/lisp/cedet/semantic/symref/list.el b/lisp/cedet/semantic/symref/list.el
index 9be53d90b08..39d4fe10c37 100644
--- a/lisp/cedet/semantic/symref/list.el
+++ b/lisp/cedet/semantic/symref/list.el
@@ -1,6 +1,6 @@
1;;; semantic/symref/list.el --- Symref Output List UI. 1;;; semantic/symref/list.el --- Symref Output List UI.
2 2
3;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. 3;; Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
4 4
5;; Author: Eric M. Ludlam <eric@siege-engine.com> 5;; Author: Eric M. Ludlam <eric@siege-engine.com>
6 6
@@ -189,6 +189,7 @@ Display the references in`semantic-symref-results-mode'."
189 "The current results in a results mode buffer.") 189 "The current results in a results mode buffer.")
190 190
191(defun semantic-symref-results-mode (results) 191(defun semantic-symref-results-mode (results)
192 ;; FIXME: Use define-derived-mode.
192 "Major-mode for displaying Semantic Symbol Reference RESULTS. 193 "Major-mode for displaying Semantic Symbol Reference RESULTS.
193RESULTS is an object of class `semantic-symref-results'." 194RESULTS is an object of class `semantic-symref-results'."
194 (interactive) 195 (interactive)
@@ -204,7 +205,7 @@ RESULTS is an object of class `semantic-symref-results'."
204 (buffer-disable-undo) 205 (buffer-disable-undo)
205 (set (make-local-variable 'font-lock-global-modes) nil) 206 (set (make-local-variable 'font-lock-global-modes) nil)
206 (font-lock-mode -1) 207 (font-lock-mode -1)
207 (run-hooks 'semantic-symref-results-mode-hook) 208 (run-mode-hooks 'semantic-symref-results-mode-hook)
208 ) 209 )
209 210
210(defun semantic-symref-hide-buffer () 211(defun semantic-symref-hide-buffer ()
diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el
index 5fb2433b19e..7df06a608f5 100644
--- a/lisp/cedet/srecode/srt-mode.el
+++ b/lisp/cedet/srecode/srt-mode.el
@@ -1,6 +1,6 @@
1;;; srecode/srt-mode.el --- Major mode for writing screcode macros 1;;; srecode/srt-mode.el --- Major mode for writing screcode macros
2 2
3;; Copyright (C) 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 3;; Copyright (C) 2005, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
4 4
5;; This file is part of GNU Emacs. 5;; This file is part of GNU Emacs.
6 6
@@ -183,27 +183,20 @@ we can tell font lock about them.")
183 "Keymap used in srecode mode.") 183 "Keymap used in srecode mode.")
184 184
185;;;###autoload 185;;;###autoload
186(defun srecode-template-mode () 186(define-derived-mode srecode-template-mode fundamental-mode "SRecorder"
187 "Major-mode for writing SRecode macros." 187 "Major-mode for writing SRecode macros."
188 (interactive) 188 (setq comment-start ";;"
189 (kill-all-local-variables)
190 (setq major-mode 'srecode-template-mode
191 mode-name "SRecoder"
192 comment-start ";;"
193 comment-end "") 189 comment-end "")
194 (set (make-local-variable 'parse-sexp-ignore-comments) t) 190 (set (make-local-variable 'parse-sexp-ignore-comments) t)
195 (set (make-local-variable 'comment-start-skip) 191 (set (make-local-variable 'comment-start-skip)
196 "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\);+ *") 192 "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\);+ *")
197 (set-syntax-table srecode-template-mode-syntax-table)
198 (use-local-map srecode-template-mode-map)
199 (set (make-local-variable 'font-lock-defaults) 193 (set (make-local-variable 'font-lock-defaults)
200 '(srecode-font-lock-keywords 194 '(srecode-font-lock-keywords
201 nil ;; perform string/comment fontification 195 nil ;; perform string/comment fontification
202 nil ;; keywords are case sensitive. 196 nil ;; keywords are case sensitive.
203 ;; This puts _ & - as a word constituant, 197 ;; This puts _ & - as a word constituant,
204 ;; simplifying our keywords significantly 198 ;; simplifying our keywords significantly
205 ((?_ . "w") (?- . "w")))) 199 ((?_ . "w") (?- . "w")))))
206 (run-hooks 'srecode-template-mode-hook))
207 200
208;;;###autoload 201;;;###autoload
209(defalias 'srt-mode 'srecode-template-mode) 202(defalias 'srt-mode 'srecode-template-mode)
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 636f78031fa..b4fd17ca453 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -1061,7 +1061,12 @@ For now these keys are useful:
1061 (message "DocView: please wait till conversion finished.") 1061 (message "DocView: please wait till conversion finished.")
1062 (let ((txt (expand-file-name "doc.txt" (doc-view-current-cache-dir)))) 1062 (let ((txt (expand-file-name "doc.txt" (doc-view-current-cache-dir))))
1063 (if (file-readable-p txt) 1063 (if (file-readable-p txt)
1064 (find-file txt) 1064 (let ((name (concat "Text contents of "
1065 (file-name-nondirectory buffer-file-name)))
1066 (dir (file-name-directory buffer-file-name)))
1067 (with-current-buffer (find-file txt)
1068 (rename-buffer name)
1069 (setq default-directory dir)))
1065 (doc-view-doc->txt txt 'doc-view-open-text))))) 1070 (doc-view-doc->txt txt 'doc-view-open-text)))))
1066 1071
1067;;;;; Toggle between editing and viewing 1072;;;;; Toggle between editing and viewing
@@ -1238,11 +1243,11 @@ If BACKWARD is non-nil, jump to the previous match."
1238 (concat "No PNG support is available, or some conversion utility for " 1243 (concat "No PNG support is available, or some conversion utility for "
1239 (file-name-extension doc-view-buffer-file-name) 1244 (file-name-extension doc-view-buffer-file-name)
1240 " files is missing.")) 1245 " files is missing."))
1241 (if (and (executable-find doc-view-pdftotext-program) 1246 (when (and (executable-find doc-view-pdftotext-program)
1242 (y-or-n-p 1247 (y-or-n-p
1243 "Unable to render file. View extracted text instead? ")) 1248 "Unable to render file. View extracted text instead? "))
1244 (doc-view-open-text) 1249 (doc-view-open-text))
1245 (doc-view-toggle-display)))) 1250 (doc-view-toggle-display)))
1246 1251
1247(defvar bookmark-make-record-function) 1252(defvar bookmark-make-record-function)
1248 1253
diff --git a/lisp/emacs-lisp/chart.el b/lisp/emacs-lisp/chart.el
index 84bfd706afc..b2696425ff7 100644
--- a/lisp/emacs-lisp/chart.el
+++ b/lisp/emacs-lisp/chart.el
@@ -1,7 +1,7 @@
1;;; chart.el --- Draw charts (bar charts, etc) 1;;; chart.el --- Draw charts (bar charts, etc)
2 2
3;; Copyright (C) 1996, 1998, 1999, 2001, 2004, 2005, 2007, 2008, 2009, 3;; Copyright (C) 1996, 1998, 1999, 2001, 2004, 2005, 2007, 2008, 2009,
4;; 2010 Free Software Foundation, Inc. 4;; 2010, 2011 Free Software Foundation, Inc.
5 5
6;; Author: Eric M. Ludlam <zappo@gnu.org> 6;; Author: Eric M. Ludlam <zappo@gnu.org>
7;; Version: 0.2 7;; Version: 0.2
@@ -62,17 +62,13 @@
62(require 'eieio) 62(require 'eieio)
63 63
64;;; Code: 64;;; Code:
65(defvar chart-map (make-sparse-keymap) "Keymap used in chart mode.") 65(defvar chart-mode-map (make-sparse-keymap) "Keymap used in chart mode.")
66(define-obsolete-variable-alias 'chart-map 'chart-mode-map "24.1")
66 67
67(defvar chart-local-object nil 68(defvar chart-local-object nil
68 "Local variable containing the locally displayed chart object.") 69 "Local variable containing the locally displayed chart object.")
69(make-variable-buffer-local 'chart-local-object) 70(make-variable-buffer-local 'chart-local-object)
70 71
71(defvar chart-face-list nil
72 "Faces used to colorize charts.
73List is limited currently, which is ok since you really can't display
74too much in text characters anyways.")
75
76(defvar chart-face-color-list '("red" "green" "blue" 72(defvar chart-face-color-list '("red" "green" "blue"
77 "cyan" "yellow" "purple") 73 "cyan" "yellow" "purple")
78 "Colors to use when generating `chart-face-list'. 74 "Colors to use when generating `chart-face-list'.
@@ -90,41 +86,42 @@ Useful if new Emacs is used on B&W display.")
90 :group 'eieio 86 :group 'eieio
91 :type 'boolean) 87 :type 'boolean)
92 88
93(if (and (if (fboundp 'display-color-p) 89(defvar chart-face-list
94 (display-color-p) 90 (if (if (fboundp 'display-color-p)
95 window-system) 91 (display-color-p)
96 (not chart-face-list)) 92 window-system)
97 (let ((cl chart-face-color-list) 93 (let ((cl chart-face-color-list)
98 (pl chart-face-pixmap-list) 94 (pl chart-face-pixmap-list)
99 nf) 95 (faces ())
100 (while cl 96 nf)
101 (setq nf (make-face (intern (concat "chart-" (car cl) "-" (car pl))))) 97 (while cl
102 (if (condition-case nil 98 (setq nf (make-face
103 (> (x-display-color-cells) 4) 99 (intern (concat "chart-" (car cl) "-" (car pl)))))
104 (error t)) 100 (set-face-background nf (if (condition-case nil
105 (set-face-background nf (car cl)) 101 (> (x-display-color-cells) 4)
106 (set-face-background nf "white")) 102 (error t))
107 (set-face-foreground nf "black") 103 (car cl)
108 (if (and chart-face-use-pixmaps 104 "white"))
109 pl 105 (set-face-foreground nf "black")
110 (fboundp 'set-face-background-pixmap)) 106 (if (and chart-face-use-pixmaps
111 (condition-case nil 107 pl
112 (set-face-background-pixmap nf (car pl)) 108 (fboundp 'set-face-background-pixmap))
113 (error (message "Cannot set background pixmap %s" (car pl))))) 109 (condition-case nil
114 (setq chart-face-list (cons nf chart-face-list)) 110 (set-face-background-pixmap nf (car pl))
115 (setq cl (cdr cl) 111 (error (message "Cannot set background pixmap %s" (car pl)))))
116 pl (cdr pl))))) 112 (push nf faces)
117 113 (setq cl (cdr cl)
118(defun chart-mode () 114 pl (cdr pl)))
115 faces))
116 "Faces used to colorize charts.
117List is limited currently, which is ok since you really can't display
118too much in text characters anyways.")
119
120(define-derived-mode chart-mode fundamental-mode "CHART"
119 "Define a mode in Emacs for displaying a chart." 121 "Define a mode in Emacs for displaying a chart."
120 (kill-all-local-variables)
121 (use-local-map chart-map)
122 (setq major-mode 'chart-mode
123 mode-name "CHART")
124 (buffer-disable-undo) 122 (buffer-disable-undo)
125 (set (make-local-variable 'font-lock-global-modes) nil) 123 (set (make-local-variable 'font-lock-global-modes) nil)
126 (font-lock-mode -1) 124 (font-lock-mode -1) ;Isn't it off already? --Stef
127 (run-hooks 'chart-mode-hook)
128 ) 125 )
129 126
130(defun chart-new-buffer (obj) 127(defun chart-new-buffer (obj)
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 210f6985dc9..26e8c9aee28 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
12011-01-13 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * erc.el (erc-mode):
4 * erc-dcc.el (erc-dcc-chat-mode): Use define-derived-mode.
5
12010-11-11 Glenn Morris <rgm@gnu.org> 62010-11-11 Glenn Morris <rgm@gnu.org>
2 7
3 * erc-lang.el (erc-cmd-LANG): Fix what may have been a typo. 8 * erc-lang.el (erc-cmd-LANG): Fix what may have been a typo.
@@ -25,17 +30,17 @@
252010-08-14 Vivek Dasmohapatra <vivek@etla.org> 302010-08-14 Vivek Dasmohapatra <vivek@etla.org>
26 31
27 * erc-join.el (erc-autojoin-timing, erc-autojoin-delay): New vars. 32 * erc-join.el (erc-autojoin-timing, erc-autojoin-delay): New vars.
28 (erc-autojoin-channels-delayed, erc-autojoin-after-ident): New 33 (erc-autojoin-channels-delayed, erc-autojoin-after-ident):
29 functions. 34 New functions.
30 (erc-autojoin-channels): Allow autojoining after ident (Bug#5521). 35 (erc-autojoin-channels): Allow autojoining after ident (Bug#5521).
31 36
322010-08-08 Fran Litterio <flitterio@gmail.com> 372010-08-08 Fran Litterio <flitterio@gmail.com>
33 38
34 * erc-backend.el (erc-server-filter-function): Call 39 * erc-backend.el (erc-server-filter-function):
35 erc-log-irc-protocol. 40 Call erc-log-irc-protocol.
36 41
37 * erc.el (erc-toggle-debug-irc-protocol): Bind 42 * erc.el (erc-toggle-debug-irc-protocol):
38 erc-toggle-debug-irc-protocol to t. 43 Bind erc-toggle-debug-irc-protocol to t.
39 44
402010-05-07 Chong Yidong <cyd@stupidchicken.com> 452010-05-07 Chong Yidong <cyd@stupidchicken.com>
41 46
@@ -126,7 +131,7 @@
126 131
127See ChangeLog.08 for earlier changes. 132See ChangeLog.08 for earlier changes.
128 133
129 Copyright (C) 2009, 2010 Free Software Foundation, Inc. 134 Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
130 135
131 This file is part of GNU Emacs. 136 This file is part of GNU Emacs.
132 137
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index 2da4c83b7cb..5578e52791d 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -1,7 +1,7 @@
1;;; erc-dcc.el --- CTCP DCC module for ERC 1;;; erc-dcc.el --- CTCP DCC module for ERC
2 2
3;; Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004, 2006, 2007, 3;; Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004, 2006, 2007,
4;; 2008, 2009, 2010 Free Software Foundation, Inc. 4;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
5 5
6;; Author: Ben A. Mesander <ben@gnu.ai.mit.edu> 6;; Author: Ben A. Mesander <ben@gnu.ai.mit.edu>
7;; Noah Friedman <friedman@prep.ai.mit.edu> 7;; Noah Friedman <friedman@prep.ai.mit.edu>
@@ -1098,17 +1098,11 @@ Possible values are: ask, auto, ignore."
1098 map) 1098 map)
1099 "Keymap for `erc-dcc-mode'.") 1099 "Keymap for `erc-dcc-mode'.")
1100 1100
1101(defun erc-dcc-chat-mode () 1101(define-derived-mode erc-dcc-chat-mode fundamental-mode "DCC-Chat"
1102 "Major mode for wasting time via DCC chat." 1102 "Major mode for wasting time via DCC chat."
1103 (interactive)
1104 (kill-all-local-variables)
1105 (setq mode-line-process '(":%s") 1103 (setq mode-line-process '(":%s")
1106 mode-name "DCC-Chat"
1107 major-mode 'erc-dcc-chat-mode
1108 erc-send-input-line-function 'erc-dcc-chat-send-input-line 1104 erc-send-input-line-function 'erc-dcc-chat-send-input-line
1109 erc-default-recipients '(dcc)) 1105 erc-default-recipients '(dcc)))
1110 (use-local-map erc-dcc-chat-mode-map)
1111 (run-hooks 'erc-dcc-chat-mode-hook))
1112 1106
1113(defun erc-dcc-chat-send-input-line (recipient line &optional force) 1107(defun erc-dcc-chat-send-input-line (recipient line &optional force)
1114 "Send LINE to the remote end. 1108 "Send LINE to the remote end.
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 54f87982f8f..ab3f12a59b6 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1,7 +1,7 @@
1;; erc.el --- An Emacs Internet Relay Chat client 1;; erc.el --- An Emacs Internet Relay Chat client
2 2
3;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 3;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
4;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 4;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
5 5
6;; Author: Alexander L. Belikoff (alexander@belikoff.net) 6;; Author: Alexander L. Belikoff (alexander@belikoff.net)
7;; Contributors: Sergey Berezin (sergey.berezin@cs.cmu.edu), 7;; Contributors: Sergey Berezin (sergey.berezin@cs.cmu.edu),
@@ -1439,28 +1439,16 @@ Defaults to the server buffer."
1439 1439
1440;; Mode activation routines 1440;; Mode activation routines
1441 1441
1442(defun erc-mode () 1442(define-derived-mode erc-mode fundamental-mode "ERC"
1443 "Major mode for Emacs IRC. 1443 "Major mode for Emacs IRC."
1444Special commands: 1444 (setq local-abbrev-table erc-mode-abbrev-table)
1445
1446\\{erc-mode-map}
1447
1448Turning on `erc-mode' runs the hook `erc-mode-hook'."
1449 (kill-all-local-variables)
1450 (use-local-map erc-mode-map)
1451 (setq mode-name "ERC"
1452 major-mode 'erc-mode
1453 local-abbrev-table erc-mode-abbrev-table)
1454 (set-syntax-table erc-mode-syntax-table)
1455 (when (boundp 'next-line-add-newlines) 1445 (when (boundp 'next-line-add-newlines)
1456 (set (make-local-variable 'next-line-add-newlines) nil)) 1446 (set (make-local-variable 'next-line-add-newlines) nil))
1457 (setq line-move-ignore-invisible t) 1447 (setq line-move-ignore-invisible t)
1458 (set (make-local-variable 'paragraph-separate) 1448 (set (make-local-variable 'paragraph-separate)
1459 (concat "\C-l\\|\\(^" (regexp-quote (erc-prompt)) "\\)")) 1449 (concat "\C-l\\|\\(^" (regexp-quote (erc-prompt)) "\\)"))
1460 (set (make-local-variable 'paragraph-start) 1450 (set (make-local-variable 'paragraph-start)
1461 (concat "\\(" (regexp-quote (erc-prompt)) "\\)")) 1451 (concat "\\(" (regexp-quote (erc-prompt)) "\\)")))
1462 ;; Run the mode hooks
1463 (run-hooks 'erc-mode-hook))
1464 1452
1465;; activation 1453;; activation
1466 1454
diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el
index 81a2bd49441..1e9412cb7a1 100644
--- a/lisp/mail/mail-utils.el
+++ b/lisp/mail/mail-utils.el
@@ -182,56 +182,37 @@ Return a modified address list."
182 (mapconcat 'identity (rfc822-addresses address) ", ")) 182 (mapconcat 'identity (rfc822-addresses address) ", "))
183 (let (pos) 183 (let (pos)
184 184
185 ;; Detect nested comments. 185 ;; Strip comments.
186 (if (string-match "[ \t]*(\\([^)\\]\\|\\\\.\\|\\\\\n\\)*(" address) 186 (while (setq pos (string-match
187 ;; Strip nested comments. 187 "[ \t]*(\\([^()\\]\\|\\\\.\\|\\\\\n\\)*)"
188 (with-temp-buffer 188 address))
189 (insert address) 189 (setq address (replace-match "" nil nil address 0)))
190 (set-syntax-table lisp-mode-syntax-table)
191 (goto-char 1)
192 (while (search-forward "(" nil t)
193 (forward-char -1)
194 (skip-chars-backward " \t")
195 (delete-region (point)
196 (save-excursion
197 (condition-case ()
198 (forward-sexp 1)
199 (error (goto-char (point-max))))
200 (point))))
201 (setq address (buffer-string)))
202 ;; Strip non-nested comments an easier way.
203 (while (setq pos (string-match
204 ;; This doesn't hack rfc822 nested comments
205 ;; `(xyzzy (foo) whinge)' properly. Big deal.
206 "[ \t]*(\\([^)\\]\\|\\\\.\\|\\\\\n\\)*)"
207 address))
208 (setq address (replace-match "" nil nil address 0))))
209 190
210 ;; strip surrounding whitespace 191 ;; strip surrounding whitespace
211 (string-match "\\`[ \t\n]*" address) 192 (string-match "\\`[ \t\n]*" address)
212 (setq address (substring address 193 (setq address (substring address
213 (match-end 0) 194 (match-end 0)
214 (string-match "[ \t\n]*\\'" address 195 (string-match "[ \t\n]*\\'" address
215 (match-end 0)))) 196 (match-end 0))))
216 197
217 ;; strip `quoted' names (This is supposed to hack `"Foo Bar" <bar@host>') 198 ;; strip `quoted' names (This is supposed to hack `"Foo Bar" <bar@host>')
218 (setq pos 0) 199 (setq pos 0)
219 (while (setq pos (string-match 200 (while (setq pos (string-match
220 "\\([ \t]?\\)\\([ \t]*\"\\([^\"\\]\\|\\\\.\\|\\\\\n\\)*\"[ \t\n]*\\)" 201 "\\([ \t]?\\)\\([ \t]*\"\\([^\"\\]\\|\\\\.\\|\\\\\n\\)*\"[ \t\n]*\\)"
221 address pos)) 202 address pos))
222 ;; If the next thing is "@", we have "foo bar"@host. Leave it. 203 ;; If the next thing is "@", we have "foo bar"@host. Leave it.
223 (if (and (> (length address) (match-end 0)) 204 (if (and (> (length address) (match-end 0))
224 (= (aref address (match-end 0)) ?@)) 205 (= (aref address (match-end 0)) ?@))
225 (setq pos (match-end 0)) 206 (setq pos (match-end 0))
226 ;; Otherwise discard the "..." part. 207 ;; Otherwise discard the "..." part.
227 (setq address (replace-match "" nil nil address 2)))) 208 (setq address (replace-match "" nil nil address 2))))
228 ;; If this address contains <...>, replace it with just 209 ;; If this address contains <...>, replace it with just
229 ;; the part between the <...>. 210 ;; the part between the <...>.
230 (while (setq pos (string-match "\\(,\\s-*\\|\\`\\)\\([^,]*<\\([^>,:]*\\)>[^,]*\\)\\(\\s-*,\\|\\'\\)" 211 (while (setq pos (string-match "\\(,\\s-*\\|\\`\\)\\([^,]*<\\([^>,:]*\\)>[^,]*\\)\\(\\s-*,\\|\\'\\)"
231 address)) 212 address))
232 (setq address (replace-match (match-string 3 address) 213 (setq address (replace-match (match-string 3 address)
233 nil 'literal address 2))) 214 nil 'literal address 2)))
234 address)))) 215 address))))
235 216
236;; The following piece of ugliness is legacy code. The name was an 217;; The following piece of ugliness is legacy code. The name was an
237;; unfortunate choice --- a flagrant violation of the Emacs Lisp 218;; unfortunate choice --- a flagrant violation of the Emacs Lisp
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 093892a1100..8c5890b718d 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -1,6 +1,6 @@
1;;; rcirc.el --- default, simple IRC client. 1;;; rcirc.el --- default, simple IRC client.
2 2
3;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 3;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
4;; Free Software Foundation, Inc. 4;; Free Software Foundation, Inc.
5 5
6;; Author: Ryan Yeske 6;; Author: Ryan Yeske
@@ -895,6 +895,7 @@ Each element looks like (FILENAME . TEXT).")
895This number is independent of the number of lines in the buffer.") 895This number is independent of the number of lines in the buffer.")
896 896
897(defun rcirc-mode (process target) 897(defun rcirc-mode (process target)
898 ;; FIXME: Use define-derived-mode.
898 "Major mode for IRC channel buffers. 899 "Major mode for IRC channel buffers.
899 900
900\\{rcirc-mode-map}" 901\\{rcirc-mode-map}"
@@ -973,7 +974,7 @@ This number is independent of the number of lines in the buffer.")
973 (add-hook 'completion-at-point-functions 974 (add-hook 'completion-at-point-functions
974 'rcirc-completion-at-point nil 'local) 975 'rcirc-completion-at-point nil 'local)
975 976
976 (run-hooks 'rcirc-mode-hook)) 977 (run-mode-hooks 'rcirc-mode-hook))
977 978
978(defun rcirc-update-prompt (&optional all) 979(defun rcirc-update-prompt (&optional all)
979 "Reset the prompt string in the current buffer. 980 "Reset the prompt string in the current buffer.
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index e8531be05f8..00753467631 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,8 @@
12011-01-13 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * org-remember.el (org-remember-mode):
4 * org-capture.el (org-capture-mode): Don't run hook redundantly.
5
12011-01-09 Chong Yidong <cyd@stupidchicken.com> 62011-01-09 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * org-faces.el (org-link): Inherit from link face. 8 * org-faces.el (org-link): Inherit from link face.
@@ -263,8 +268,8 @@
263 268
2642010-12-11 Sébastien Vauban <wxhgmqzgwmuf@spammotel.com> 2692010-12-11 Sébastien Vauban <wxhgmqzgwmuf@spammotel.com>
265 270
266 * org.el (org-complete-tags-always-offer-all-agenda-tags): Fix 271 * org.el (org-complete-tags-always-offer-all-agenda-tags):
267 docstring. 272 Fix docstring.
268 273
2692010-12-11 Julien Danjou <julien@danjou.info> 2742010-12-11 Julien Danjou <julien@danjou.info>
270 275
@@ -280,10 +285,10 @@
280 285
2812010-12-11 Nicolas Goaziou <n.goaziou@gmail.com> 2862010-12-11 Nicolas Goaziou <n.goaziou@gmail.com>
282 287
283 * org-latex.el (org-export-latex-lists): do not add an 288 * org-latex.el (org-export-latex-lists): Do not add an
284 unnecessary newline character after a list. 289 unnecessary newline character after a list.
285 290
286 * org-list.el (org-list-bottom-point-with-indent): ensure bottom 291 * org-list.el (org-list-bottom-point-with-indent): Ensure bottom
287 point is just after a non blank line. 292 point is just after a non blank line.
288 293
2892010-12-11 Eric Schulte <schulte.eric@gmail.com> 2942010-12-11 Eric Schulte <schulte.eric@gmail.com>
@@ -323,7 +328,7 @@
323 328
3242010-12-11 Eric Schulte <schulte.eric@gmail.com> 3292010-12-11 Eric Schulte <schulte.eric@gmail.com>
325 330
326 * ob-eval.el (org-babel-eval-wipe-error-buffer): Fixed compiler 331 * ob-eval.el (org-babel-eval-wipe-error-buffer): Fix compiler
327 warning and added documentation string. 332 warning and added documentation string.
328 333
3292010-12-11 Eric Schulte <schulte.eric@gmail.com> 3342010-12-11 Eric Schulte <schulte.eric@gmail.com>
@@ -376,8 +381,8 @@
376 381
3772010-12-11 Eric Schulte <schulte.eric@gmail.com> 3822010-12-11 Eric Schulte <schulte.eric@gmail.com>
378 383
379 * ob-python.el (org-babel-python-table-or-string): Using 384 * ob-python.el (org-babel-python-table-or-string):
380 `org-babel-script-escape' for reading string input from scripting 385 Using `org-babel-script-escape' for reading string input from scripting
381 languages. 386 languages.
382 387
3832010-12-11 Achim Gratz <Stromeko@nexgo.de> (tiny change) 3882010-12-11 Achim Gratz <Stromeko@nexgo.de> (tiny change)
@@ -388,7 +393,7 @@
388 393
3892010-12-11 Eric Schulte <schulte.eric@gmail.com> 3942010-12-11 Eric Schulte <schulte.eric@gmail.com>
390 395
391 * ob.el (org-babel-parse-header-arguments): Removed addition of 396 * ob.el (org-babel-parse-header-arguments): Remove addition of
392 ":" to singleton first header arguments as it was leading to errors. 397 ":" to singleton first header arguments as it was leading to errors.
393 398
3942010-12-11 Carsten Dominik <carsten.dominik@gmail.com> 3992010-12-11 Carsten Dominik <carsten.dominik@gmail.com>
@@ -419,7 +424,7 @@
419 424
4202010-12-11 Achim Gratz <Stromeko@Stromeko.DE> (tiny change) 4252010-12-11 Achim Gratz <Stromeko@Stromeko.DE> (tiny change)
421 426
422 * org-clock.el (org-get-clocktable): previous patch incorrectly 427 * org-clock.el (org-get-clocktable): Previous patch incorrectly
423 required whitespace in front of #+BEGIN: and #+END: 428 required whitespace in front of #+BEGIN: and #+END:
424 429
4252010-12-11 Dan Davison <dandavison7@gmail.com> 4302010-12-11 Dan Davison <dandavison7@gmail.com>
@@ -429,12 +434,12 @@
429 434
4302010-12-11 Nicolas Goaziou <n.goaziou@gmail.com> 4352010-12-11 Nicolas Goaziou <n.goaziou@gmail.com>
431 436
432 * org-list.el (org-cycle-list-bullet): ensure point is at bol before 437 * org-list.el (org-cycle-list-bullet): Ensure point is at bol before
433 checking item indentation. 438 checking item indentation.
434 439
4352010-12-11 Eric Schulte <schulte.eric@gmail.com> 4402010-12-11 Eric Schulte <schulte.eric@gmail.com>
436 441
437 * ob.el (org-babel-map-src-blocks): Moved to earlier in the file 442 * ob.el (org-babel-map-src-blocks): Move to earlier in the file
438 and now autoloading. 443 and now autoloading.
439 444
4402010-12-11 Eric Schulte <schulte.eric@gmail.com> 4452010-12-11 Eric Schulte <schulte.eric@gmail.com>
@@ -512,7 +517,7 @@
5122010-12-11 Noorul Islam <noorul@noorul.com> 5172010-12-11 Noorul Islam <noorul@noorul.com>
513 518
514 * org-latex.el (org-export-latex-hyperref-format): New option. 519 * org-latex.el (org-export-latex-hyperref-format): New option.
515 (org-export-latex-href-format): Renamed the existing variable 520 (org-export-latex-href-format): Rename the existing variable
516 `org-export-latex-hyperref-format' as `org-export-latex-href-format' 521 `org-export-latex-hyperref-format' as `org-export-latex-href-format'
517 (org-export-latex-links): Use `org-export-latex-hyperref-format' and 522 (org-export-latex-links): Use `org-export-latex-hyperref-format' and
518 `org-export-latex-href-format' 523 `org-export-latex-href-format'
@@ -650,8 +655,8 @@
650 * org.el (org-shorten-string): New function. 655 * org.el (org-shorten-string): New function.
651 656
652 * org-exp.el (org-export-convert-protected-spaces): New function. 657 * org-exp.el (org-export-convert-protected-spaces): New function.
653 (org-export-preprocess-string): Call 658 (org-export-preprocess-string):
654 `org-export-convert-protected-spaces' to handle new hard spaces. 659 Call `org-export-convert-protected-spaces' to handle new hard spaces.
655 660
6562010-12-11 David Maus <dmaus@ictsoc.de> 6612010-12-11 David Maus <dmaus@ictsoc.de>
657 662
@@ -731,8 +736,8 @@
731 736
7322010-11-11 Dan Davison <davison@stats.ox.ac.uk> 7372010-11-11 Dan Davison <davison@stats.ox.ac.uk>
733 738
734 * org-exp.el (org-export-format-source-code-or-example): Use 739 * org-exp.el (org-export-format-source-code-or-example):
735 minted for latex source code export if `org-export-latex-listings' 740 Use minted for latex source code export if `org-export-latex-listings'
736 has the value 'minted 741 has the value 'minted
737 742
738 * org-latex.el (org-export-latex-listings): Document special value 743 * org-latex.el (org-export-latex-listings): Document special value
@@ -747,8 +752,8 @@
747 752
7482010-11-11 Eric Schulte <schulte.eric@gmail.com> 7532010-11-11 Eric Schulte <schulte.eric@gmail.com>
749 754
750 * ob-gnuplot.el (org-babel-variable-assignments:gnuplot): Fixed 755 * ob-gnuplot.el (org-babel-variable-assignments:gnuplot):
751 bug in gnuplot data file assignment using user variables. 756 Fix bug in gnuplot data file assignment using user variables.
752 757
7532010-11-11 Eric Schulte <schulte.eric@gmail.com> 7582010-11-11 Eric Schulte <schulte.eric@gmail.com>
754 759
@@ -792,7 +797,7 @@
792 797
7932010-11-11 Eric Schulte <schulte.eric@gmail.com> 7982010-11-11 Eric Schulte <schulte.eric@gmail.com>
794 799
795 * ob-clojure.el (org-babel-clojure-babel-clojure-cmd): Fixed error 800 * ob-clojure.el (org-babel-clojure-babel-clojure-cmd): Fix error
796 message when clojure binary is not found. 801 message when clojure binary is not found.
797 802
7982010-11-11 Carsten Dominik <carsten.dominik@gmail.com> 8032010-11-11 Carsten Dominik <carsten.dominik@gmail.com>
@@ -822,8 +827,8 @@
822 827
8232010-11-11 David Maus <dmaus@ictsoc.de> 8282010-11-11 David Maus <dmaus@ictsoc.de>
824 829
825 * ob-haskell.el (org-babel-variable-assignments:haskell): Don't 830 * ob-haskell.el (org-babel-variable-assignments:haskell):
826 pass more than two arguments to mapc. 831 Don't pass more than two arguments to mapc.
827 832
8282010-11-11 David Maus <dmaus@ictsoc.de> 8332010-11-11 David Maus <dmaus@ictsoc.de>
829 834
@@ -910,8 +915,8 @@
910 915
9112010-11-11 Carsten Dominik <carsten.dominik@gmail.com> 9162010-11-11 Carsten Dominik <carsten.dominik@gmail.com>
912 917
913 * org-indent.el (org-indent-add-properties): Use 918 * org-indent.el (org-indent-add-properties):
914 `with-silent-modificatons'. 919 Use `with-silent-modificatons'.
915 (org-indent-remove-properties): Use `with-silent-modificatons'. 920 (org-indent-remove-properties): Use `with-silent-modificatons'.
916 921
9172010-11-11 Carsten Dominik <carsten.dominik@gmail.com> 9222010-11-11 Carsten Dominik <carsten.dominik@gmail.com>
@@ -919,8 +924,8 @@
919 * org-table.el (org-table-cookie-line-p): Fix indentation. 924 * org-table.el (org-table-cookie-line-p): Fix indentation.
920 925
921 * org-exp.el (org-store-forced-table-alignment): New function. 926 * org-exp.el (org-store-forced-table-alignment): New function.
922 (org-export-preprocess-string): Call 927 (org-export-preprocess-string):
923 `org-store-forced-table-alignment'. 928 Call `org-store-forced-table-alignment'.
924 929
925 * org-html.el (org-format-org-table-html): Use stored alignment 930 * org-html.el (org-format-org-table-html): Use stored alignment
926 information. 931 information.
@@ -932,7 +937,7 @@
932 937
9332010-11-11 Eric Schulte <schulte.eric@gmail.com> 9382010-11-11 Eric Schulte <schulte.eric@gmail.com>
934 939
935 * ob.el (org-babel-execute-src-block): Removed needless param 940 * ob.el (org-babel-execute-src-block): Remove needless param
936 sorting from ob-execute-src-block, the params are sorted already 941 sorting from ob-execute-src-block, the params are sorted already
937 by ob-sha1-hash. 942 by ob-sha1-hash.
938 943
@@ -974,7 +979,7 @@
974 979
9752010-11-11 Eric Schulte <schulte.eric@gmail.com> 9802010-11-11 Eric Schulte <schulte.eric@gmail.com>
976 981
977 * ob.el (org-babel-map-src-blocks): Fixed minor bug in and 982 * ob.el (org-babel-map-src-blocks): Fix minor bug in and
978 improved efficiency of org-babel-map-src-blocks. 983 improved efficiency of org-babel-map-src-blocks.
979 984
9802010-11-11 Eric Schulte <schulte.eric@gmail.com> 9852010-11-11 Eric Schulte <schulte.eric@gmail.com>
@@ -1293,7 +1298,7 @@
1293 1298
12942010-11-11 Eric Schulte <schulte.eric@gmail.com> 12992010-11-11 Eric Schulte <schulte.eric@gmail.com>
1295 1300
1296 * ob.el (org-babel-merge-params): Fixed order or precedence for 1301 * ob.el (org-babel-merge-params): Fix order or precedence for
1297 variables. 1302 variables.
1298 1303
12992010-11-11 Eric Schulte <schulte.eric@gmail.com> 13042010-11-11 Eric Schulte <schulte.eric@gmail.com>
@@ -1477,16 +1482,16 @@
1477 1482
14782010-11-11 Eric Schulte <schulte.eric@gmail.com> 14832010-11-11 Eric Schulte <schulte.eric@gmail.com>
1479 1484
1480 * ob-emacs-lisp.el (org-babel-expand-body:emacs-lisp): Whitespace 1485 * ob-emacs-lisp.el (org-babel-expand-body:emacs-lisp):
1481 (org-babel-execute:emacs-lisp): Whitespace. 1486 Whitespace (org-babel-execute:emacs-lisp): Whitespace.
1482 1487
14832010-11-11 Dan Davison <davison@stats.ox.ac.uk> 14882010-11-11 Dan Davison <davison@stats.ox.ac.uk>
1484 1489
1485 * ob-sh.el (org-babel-sh-variable-assignments): Provide missing 1490 * ob-sh.el (org-babel-sh-variable-assignments): Provide missing
1486 docstring 1491 docstring
1487 1492
1488 * ob-python.el (org-babel-python-variable-assignments): Provide 1493 * ob-python.el (org-babel-python-variable-assignments):
1489 missing docstring. 1494 Provide missing docstring.
1490 1495
14912010-11-11 Dan Davison <davison@stats.ox.ac.uk> 14962010-11-11 Dan Davison <davison@stats.ox.ac.uk>
1492 1497
@@ -1534,9 +1539,8 @@
1534 1539
15352010-11-11 Eric Schulte <schulte.eric@gmail.com> 15402010-11-11 Eric Schulte <schulte.eric@gmail.com>
1536 1541
1537 * ob.el (org-number-sequence): Declared 1542 * ob.el (org-number-sequence):
1538 1543 Declared * ob-R.el (org-number-sequence): Declared.
1539 * ob-R.el (org-number-sequence): Declared.
1540 1544
15412010-11-11 Dan Davison <davison@stats.ox.ac.uk> 15452010-11-11 Dan Davison <davison@stats.ox.ac.uk>
1542 1546
@@ -1554,8 +1558,8 @@
1554 1558
1555 * ob-R.el (org-babel-expand-body:R): Use `org-number-sequence'. 1559 * ob-R.el (org-babel-expand-body:R): Use `org-number-sequence'.
1556 1560
1557 * ob.el (org-babel-where-is-src-block-result): Use 1561 * ob.el (org-babel-where-is-src-block-result):
1558 `org-number-sequence'. 1562 Use `org-number-sequence'.
1559 (org-babel-current-buffer-properties): Fix variable definition. 1563 (org-babel-current-buffer-properties): Fix variable definition.
1560 1564
1561 * ob-ref.el (org-babel-ref-index-list): Use `org-number-sequence'. 1565 * ob-ref.el (org-babel-ref-index-list): Use `org-number-sequence'.
@@ -1575,8 +1579,8 @@
1575 1579
1576 * org.el (org-agenda-jump-prefer-future): New option. 1580 * org.el (org-agenda-jump-prefer-future): New option.
1577 1581
1578 * org-agenda.el (org-agenda-goto-date): Use 1582 * org-agenda.el (org-agenda-goto-date):
1579 `org-agenda-jump-prefer-future'. 1583 Use `org-agenda-jump-prefer-future'.
1580 1584
15812010-11-11 Noorul Islam <noorul@noorul.com> 15852010-11-11 Noorul Islam <noorul@noorul.com>
1582 1586
@@ -1700,18 +1704,18 @@
1700 1704
17012010-11-11 Dan Davison <davison@stats.ox.ac.uk> 17052010-11-11 Dan Davison <davison@stats.ox.ac.uk>
1702 1706
1703 * org-exp.el (org-export-latex-minted-with-line-numbers): Ensure 1707 * org-exp.el (org-export-latex-minted-with-line-numbers):
1704 that variable is declared. 1708 Ensure that variable is declared.
1705 1709
17062010-11-11 Eric Schulte <schulte.eric@gmail.com> 17102010-11-11 Eric Schulte <schulte.eric@gmail.com>
1707 1711
1708 * ob-python.el (org-src-preserve-indentation): Fixed compiler 1712 * ob-python.el (org-src-preserve-indentation): Fix compiler
1709 warning. 1713 warning.
1710 1714
17112010-11-11 Dan Davison <davison@stats.ox.ac.uk> 17152010-11-11 Dan Davison <davison@stats.ox.ac.uk>
1712 1716
1713 * org-exp.el (org-export-format-source-code-or-example): Latex 1717 * org-exp.el (org-export-format-source-code-or-example):
1714 formatting of source code blocks using the minted package 1718 Latex formatting of source code blocks using the minted package
1715 (org-export-plist-vars): Add :latex-minted property 1719 (org-export-plist-vars): Add :latex-minted property
1716 (org-export-latex-minted): Ensure variable is defined 1720 (org-export-latex-minted): Ensure variable is defined
1717 (org-export-latex-minted-langs): Ensure variable is defined. 1721 (org-export-latex-minted-langs): Ensure variable is defined.
@@ -1741,8 +1745,8 @@
1741 1745
17422010-11-11 Carsten Dominik <carsten.dominik@gmail.com> 17462010-11-11 Carsten Dominik <carsten.dominik@gmail.com>
1743 1747
1744 * org-beamer.el (org-beamer-place-default-actions-for-lists): Fix 1748 * org-beamer.el (org-beamer-place-default-actions-for-lists):
1745 typo in regexp. 1749 Fix typo in regexp.
1746 1750
17472010-11-11 Nicolas Goaziou <n.goaziou@gmail.com> 17512010-11-11 Nicolas Goaziou <n.goaziou@gmail.com>
1748 1752
@@ -1751,8 +1755,8 @@
1751 1755
17522010-11-11 David Maus <dmaus@ictsoc.de> 17562010-11-11 David Maus <dmaus@ictsoc.de>
1753 1757
1754 * org-gnus.el (org-gnus-nnimap-query-article-no-from-file): Query 1758 * org-gnus.el (org-gnus-nnimap-query-article-no-from-file):
1755 article number from file is nil by default. 1759 Query article number from file is nil by default.
1756 1760
17572010-11-11 Stephen Eglen <S.J.Eglen@damtp.cam.ac.uk> 17612010-11-11 Stephen Eglen <S.J.Eglen@damtp.cam.ac.uk>
1758 1762
@@ -1779,8 +1783,8 @@
1779 1783
17802010-11-11 Carsten Dominik <carsten.dominik@gmail.com> 17842010-11-11 Carsten Dominik <carsten.dominik@gmail.com>
1781 1785
1782 * org-mobile.el (org-mobile-force-id-on-agenda-items): Fix 1786 * org-mobile.el (org-mobile-force-id-on-agenda-items):
1783 docstring. 1787 Fix docstring.
1784 (org-mobile-write-agenda-for-mobile): Use outline path if we do 1788 (org-mobile-write-agenda-for-mobile): Use outline path if we do
1785 not have an ID and are not allowed to make one. 1789 not have an ID and are not allowed to make one.
1786 (org-mobile-get-outline-path-link): New function. 1790 (org-mobile-get-outline-path-link): New function.
@@ -1795,7 +1799,7 @@
1795 1799
17962010-11-11 Eric Schulte <schulte.eric@gmail.com> 18002010-11-11 Eric Schulte <schulte.eric@gmail.com>
1797 1801
1798 * ob.el (org-babel-number-p): Fixed documentation string. 1802 * ob.el (org-babel-number-p): Fix documentation string.
1799 1803
18002010-11-11 Eric Schulte <schulte.eric@gmail.com> 18042010-11-11 Eric Schulte <schulte.eric@gmail.com>
1801 1805
@@ -1805,7 +1809,7 @@
1805 1809
18062010-11-11 Eric Schulte <schulte.eric@gmail.com> 18102010-11-11 Eric Schulte <schulte.eric@gmail.com>
1807 1811
1808 * ob-exp.el (org-babel-exp-src-blocks): Fixed export when headings 1812 * ob-exp.el (org-babel-exp-src-blocks): Fix export when headings
1809 have links, with tests. 1813 have links, with tests.
1810 1814
18112010-11-11 Carsten Dominik <carsten.dominik@gmail.com> 18152010-11-11 Carsten Dominik <carsten.dominik@gmail.com>
@@ -1928,7 +1932,7 @@
1928 1932
19292010-11-11 Eric Schulte <schulte.eric@gmail.com> 19332010-11-11 Eric Schulte <schulte.eric@gmail.com>
1930 1934
1931 * ob.el (org-babel-confirm-evaluate): Fixed bug causing extra 1935 * ob.el (org-babel-confirm-evaluate): Fix bug causing extra
1932 prompt in ob-confirm-evaluate in some cases. 1936 prompt in ob-confirm-evaluate in some cases.
1933 1937
19342010-11-11 Eric Schulte <schulte.eric@gmail.com> 19382010-11-11 Eric Schulte <schulte.eric@gmail.com>
@@ -1956,8 +1960,8 @@
1956 1960
19572010-11-11 Carsten Dominik <carsten.dominik@gmail.com> 19612010-11-11 Carsten Dominik <carsten.dominik@gmail.com>
1958 1962
1959 * org-mobile.el (org-mobile-encryption-password): Improve 1963 * org-mobile.el (org-mobile-encryption-password):
1960 docstring. 1964 Improve docstring.
1961 (org-mobile-encryption-password-session): New variable. 1965 (org-mobile-encryption-password-session): New variable.
1962 (org-mobile-encryption-password): New function. 1966 (org-mobile-encryption-password): New function.
1963 (org-mobile-check-setup): 1967 (org-mobile-check-setup):
@@ -1971,7 +1975,7 @@
1971 1975
19722010-11-11 Jambunathan K <kjambunathan@gmail.com> 19762010-11-11 Jambunathan K <kjambunathan@gmail.com>
1973 1977
1974 * org.el (org-speed-command-hook): Added org-speed-command-hook 1978 * org.el (org-speed-command-hook): Add org-speed-command-hook
1975 (org-babel-speed-command-hook): Hook for Babel's speed commands. 1979 (org-babel-speed-command-hook): Hook for Babel's speed commands.
1976 1980
19772010-11-11 Dan Davison <davison@stats.ox.ac.uk> 19812010-11-11 Dan Davison <davison@stats.ox.ac.uk>
@@ -2110,13 +2114,13 @@
2110 2114
21112010-11-11 Dan Davison <davison@stats.ox.ac.uk> 21152010-11-11 Dan Davison <davison@stats.ox.ac.uk>
2112 2116
2113 * org-src.el (org-src-strip-leading-and-trailing-blank-lines): New 2117 * org-src.el (org-src-strip-leading-and-trailing-blank-lines):
2114 variable allowing prevention of automatic stripping of leading and 2118 New variable allowing prevention of automatic stripping of leading and
2115 trailing blank lines when exiting edit buffer. 2119 trailing blank lines when exiting edit buffer.
2116 (org-edit-src-exit): Respect value of 2120 (org-edit-src-exit): Respect value of
2117 `org-src-strip-leading-and-trailing-blank-lines' 2121 `org-src-strip-leading-and-trailing-blank-lines'
2118 (org-src-native-tab-command-maybe): Bind 2122 (org-src-native-tab-command-maybe):
2119 `org-src-strip-leading-and-trailing-blank-lines' to nil during 2123 Bind `org-src-strip-leading-and-trailing-blank-lines' to nil during
2120 this function. 2124 this function.
2121 2125
21222010-11-11 Dan Davison <davison@stats.ox.ac.uk> 21262010-11-11 Dan Davison <davison@stats.ox.ac.uk>
@@ -2235,8 +2239,8 @@
22352010-11-11 Carsten Dominik <carsten.dominik@gmail.com> 22392010-11-11 Carsten Dominik <carsten.dominik@gmail.com>
2236 2240
2237 * org-latex.el (org-export-latex-tag-markup): New option. 2241 * org-latex.el (org-export-latex-tag-markup): New option.
2238 (org-export-latex-keywords-maybe): Use 2242 (org-export-latex-keywords-maybe):
2239 `org-export-latex-tag-markup'. 2243 Use `org-export-latex-tag-markup'.
2240 2244
22412010-11-11 Rémi Vanicat <vanicat@debian.org> 22452010-11-11 Rémi Vanicat <vanicat@debian.org>
2242 2246
@@ -2267,8 +2271,8 @@
2267 2271
22682010-11-11 aaa bbb <dominik@powerbook-g4-12-van-aaa-bbb.local> 22722010-11-11 aaa bbb <dominik@powerbook-g4-12-van-aaa-bbb.local>
2269 2273
2270 * org-archive.el (org-get-local-archive-location): Use 2274 * org-archive.el (org-get-local-archive-location):
2271 `org-carchive-location' as default. 2275 Use `org-carchive-location' as default.
2272 2276
22732010-11-11 Eric Schulte <schulte.eric@gmail.com> 22772010-11-11 Eric Schulte <schulte.eric@gmail.com>
2274 2278
@@ -2305,8 +2309,8 @@
2305 2309
23062010-11-11 David Maus <dmaus@ictsoc.de> 23102010-11-11 David Maus <dmaus@ictsoc.de>
2307 2311
2308 * org-gnus.el (org-gnus-nnimap-query-article-no-from-file): New 2312 * org-gnus.el (org-gnus-nnimap-query-article-no-from-file):
2309 customization variable. 2313 New customization variable.
2310 (org-gnus-nnimap-cached-article-number): New function. 2314 (org-gnus-nnimap-cached-article-number): New function.
2311 (org-gnus-follow-link): Try to fetch cached article number of 2315 (org-gnus-follow-link): Try to fetch cached article number of
2312 message-id. 2316 message-id.
@@ -2329,8 +2333,8 @@
2329 2333
23302010-11-11 Dan Davison <davison@stats.ox.ac.uk> 23342010-11-11 Dan Davison <davison@stats.ox.ac.uk>
2331 2335
2332 * ob.el (org-babel-do-in-edit-buffer): Use 2336 * ob.el (org-babel-do-in-edit-buffer):
2333 `org-babel-where-is-src-block-head' to test for source block at 2337 Use `org-babel-where-is-src-block-head' to test for source block at
2334 point. 2338 point.
2335 2339
23362010-11-11 Eric Schulte <schulte.eric@gmail.com> 23402010-11-11 Eric Schulte <schulte.eric@gmail.com>
@@ -2418,8 +2422,8 @@
2418 2422
24192010-11-11 Eric Schulte <schulte.eric@gmail.com> 24232010-11-11 Eric Schulte <schulte.eric@gmail.com>
2420 2424
2421 * ob-tangle.el (org-babel-tangle-comment-format-beg): Format 2425 * ob-tangle.el (org-babel-tangle-comment-format-beg):
2422 string specifying the link-comment preceding a code block 2426 Format string specifying the link-comment preceding a code block
2423 (org-babel-tangle-comment-format-end): Format string specifying 2427 (org-babel-tangle-comment-format-end): Format string specifying
2424 the link-comment following a code block 2428 the link-comment following a code block
2425 (org-babel-tangle-collect-blocks): Storing more information in the 2429 (org-babel-tangle-collect-blocks): Storing more information in the
@@ -2516,7 +2520,7 @@
2516 2520
25172010-11-11 Eric Schulte <schulte.eric@gmail.com> 25212010-11-11 Eric Schulte <schulte.eric@gmail.com>
2518 2522
2519 * ob-ruby.el (org-babel-expand-body:ruby): Removed requirement of 2523 * ob-ruby.el (org-babel-expand-body:ruby): Remove requirement of
2520 inf-ruby. 2524 inf-ruby.
2521 2525
25222010-11-11 Noorul Islam <noorul@noorul.com> (tiny change) 25262010-11-11 Noorul Islam <noorul@noorul.com> (tiny change)
@@ -2615,7 +2619,7 @@
2615 2619
26162010-11-11 Nicolas Goaziou <n.goaziou@gmail.com> 26202010-11-11 Nicolas Goaziou <n.goaziou@gmail.com>
2617 2621
2618 * org-docbook.el (org-export-as-docbook): Removed check for 2622 * org-docbook.el (org-export-as-docbook): Remove check for
2619 indentation on lines that do not start with a list bullet. 2623 indentation on lines that do not start with a list bullet.
2620 2624
2621 * org-html.el (org-export-as-html): Same thing. 2625 * org-html.el (org-export-as-html): Same thing.
@@ -2633,7 +2637,7 @@
2633 2637
26342010-11-11 Nicolas Goaziou <n.goaziou@gmail.com> 26382010-11-11 Nicolas Goaziou <n.goaziou@gmail.com>
2635 2639
2636 * org-list.el (org-list-struct-indent): Added code to replace 2640 * org-list.el (org-list-struct-indent): Add code to replace
2637 bullets if needed when indenting. 2641 bullets if needed when indenting.
2638 2642
26392010-11-11 Nicolas Goaziou <n.goaziou@gmail.com> 26432010-11-11 Nicolas Goaziou <n.goaziou@gmail.com>
@@ -2683,7 +2687,7 @@
2683 2687
26842010-11-11 Nicolas Goaziou <n.goaziou@gmail.com> 26882010-11-11 Nicolas Goaziou <n.goaziou@gmail.com>
2685 2689
2686 * org-list.el (org-indent-item-tree): Removed region code. It was 2690 * org-list.el (org-indent-item-tree): Remove region code. It was
2687 prone to errors and undocumented. 2691 prone to errors and undocumented.
2688 2692
2689 * org-list.el (org-item-indent-positions): Better heuristics to 2693 * org-list.el (org-item-indent-positions): Better heuristics to
@@ -2704,7 +2708,7 @@
2704 2708
27052010-11-11 Nicolas Goaziou <n.goaziou@gmail.com> 27092010-11-11 Nicolas Goaziou <n.goaziou@gmail.com>
2706 2710
2707 * org-list.el (org-indent-item-tree): Removed unnecessary bullets 2711 * org-list.el (org-indent-item-tree): Remove unnecessary bullets
2708 fix, and improved heuristics to determine bullet when indenting. 2712 fix, and improved heuristics to determine bullet when indenting.
2709 2713
2710 * org-list.el (org-item-indent-positions): Function now returns 2714 * org-list.el (org-item-indent-positions): Function now returns
@@ -2763,8 +2767,8 @@
2763 * org-list.el (org-list-insert-item-generic): Insert the right 2767 * org-list.el (org-list-insert-item-generic): Insert the right
2764 bullet, with help of `org-list-bullet-string'. 2768 bullet, with help of `org-list-bullet-string'.
2765 2769
2766 * org-list.el (org-indent-item-tree): Use 2770 * org-list.el (org-indent-item-tree):
2767 `org-list-bullet-string'. 2771 Use `org-list-bullet-string'.
2768 2772
2769 * org-list.el (org-fix-bullet-type): Use `org-list-bullet-string'. 2773 * org-list.el (org-fix-bullet-type): Use `org-list-bullet-string'.
2770 2774
@@ -2811,8 +2815,8 @@
2811 2815
28122010-11-11 Nicolas Goaziou <n.goaziou@gmail.com> 28162010-11-11 Nicolas Goaziou <n.goaziou@gmail.com>
2813 2817
2814 * org-list.el (org-cycle-list-bullet): Check 2818 * org-list.el (org-cycle-list-bullet):
2815 `org-plain-list-ordered-item-terminator' before allowing 1. or 1) 2819 Check `org-plain-list-ordered-item-terminator' before allowing 1. or 1)
2816 as valid bullets when cycling. 2820 as valid bullets when cycling.
2817 2821
28182010-11-11 Nicolas Goaziou <n.goaziou@gmail.com> 28222010-11-11 Nicolas Goaziou <n.goaziou@gmail.com>
@@ -2839,7 +2843,7 @@
2839 2843
28402010-11-11 Nicolas Goaziou <n.goaziou@gmail.com> 28442010-11-11 Nicolas Goaziou <n.goaziou@gmail.com>
2841 2845
2842 * org-list.el (org-maybe-renumber-ordered-list): Removed call for 2846 * org-list.el (org-maybe-renumber-ordered-list): Remove call for
2843 `org-fix-bullet-type' to prevent infinite loop, and some checks 2847 `org-fix-bullet-type' to prevent infinite loop, and some checks
2844 already done in `org-renumber-ordered-list'. 2848 already done in `org-renumber-ordered-list'.
2845 2849
@@ -2860,8 +2864,8 @@
2860 2864
28612010-11-11 Nicolas Goaziou <n.goaziou@gmail.com> 28652010-11-11 Nicolas Goaziou <n.goaziou@gmail.com>
2862 2866
2863 * org-capture.el (org-capture-place-item): Use 2867 * org-capture.el (org-capture-place-item):
2864 `org-search-forward-unenclosed' and 2868 Use `org-search-forward-unenclosed' and
2865 `org-search-backward-unenclosed' and new variable 2869 `org-search-backward-unenclosed' and new variable
2866 `org-item-beginning-re'. 2870 `org-item-beginning-re'.
2867 2871
@@ -2881,10 +2885,10 @@
2881 * org-list.el (org-list-make-subtree): Add protection when used 2885 * org-list.el (org-list-make-subtree): Add protection when used
2882 outside of list 2886 outside of list
2883 2887
2884 * org-list.el (org-insert-item): Removed useless hack now 2888 * org-list.el (org-insert-item): Remove useless hack now
2885 `org-in-item-p' is fixed. 2889 `org-in-item-p' is fixed.
2886 2890
2887 * org-timer.el (org-timer-item): Removed useless hack now 2891 * org-timer.el (org-timer-item): Remove useless hack now
2888 `org-in-item-p' is fixed. 2892 `org-in-item-p' is fixed.
2889 2893
28902010-11-11 Nicolas Goaziou <n.goaziou@gmail.com> 28942010-11-11 Nicolas Goaziou <n.goaziou@gmail.com>
@@ -2938,8 +2942,8 @@
2938 * org-list.el (org-search-forward-unenclosed): Can send errors 2942 * org-list.el (org-search-forward-unenclosed): Can send errors
2939 now. Removed useless usage of COUNT. 2943 now. Removed useless usage of COUNT.
2940 2944
2941 * org-list.el (org-update-checkbox-count): Use 2945 * org-list.el (org-update-checkbox-count):
2942 `org-search-forward-unenclosed' and 2946 Use `org-search-forward-unenclosed' and
2943 `org-search-backward-unenclosed' instead of `re-search-forward' 2947 `org-search-backward-unenclosed' instead of `re-search-forward'
2944 and `re-search-backward'. 2948 and `re-search-backward'.
2945 2949
@@ -2947,8 +2951,8 @@
2947 and `org-search-backward-unenclosed' instead of 2951 and `org-search-backward-unenclosed' instead of
2948 `re-search-forward' and `re-search-backward'. 2952 `re-search-forward' and `re-search-backward'.
2949 2953
2950 * org-list.el (org-list-make-subtree): Use 2954 * org-list.el (org-list-make-subtree):
2951 `org-search-forward-unenclosed' and 2955 Use `org-search-forward-unenclosed' and
2952 `org-search-backward-unenclosed' instead of `re-search-forward' 2956 `org-search-backward-unenclosed' instead of `re-search-forward'
2953 and `re-search-backward'. 2957 and `re-search-backward'.
2954 2958
@@ -2962,7 +2966,7 @@
2962 * org-timer.el (org-timer-item): Refactoring. Compute timer string 2966 * org-timer.el (org-timer-item): Refactoring. Compute timer string
2963 before inserting it in the buffer 2967 before inserting it in the buffer
2964 2968
2965 * org-timer.el (org-timer): Added an optional argument to return 2969 * org-timer.el (org-timer): Add an optional argument to return
2966 timer string instead of inserting it. 2970 timer string instead of inserting it.
2967 2971
29682010-11-11 Nicolas Goaziou <n.goaziou@gmail.com> 29722010-11-11 Nicolas Goaziou <n.goaziou@gmail.com>
@@ -3171,8 +3175,8 @@
3171 3175
31722010-11-11 Nicolas Goaziou <n.goaziou@gmail.com> 31762010-11-11 Nicolas Goaziou <n.goaziou@gmail.com>
3173 3177
3174 * org-html.el (org-export-html-preprocess): Replace 3178 * org-html.el (org-export-html-preprocess):
3175 `org-list-end-re' by a blank line during pre-process. 3179 Replace `org-list-end-re' by a blank line during pre-process.
3176 3180
31772010-11-11 Nicolas Goaziou <n.goaziou@gmail.com> 31812010-11-11 Nicolas Goaziou <n.goaziou@gmail.com>
3178 3182
@@ -3271,8 +3275,8 @@
3271 3275
32722010-11-11 Carsten Dominik <carsten.dominik@gmail.com> 32762010-11-11 Carsten Dominik <carsten.dominik@gmail.com>
3273 3277
3274 * org-exp.el (org-export-concatenate-multiline-emphasis): Ignore 3278 * org-exp.el (org-export-concatenate-multiline-emphasis):
3275 matches that start in a headline. 3279 Ignore matches that start in a headline.
3276 3280
32772010-11-11 Eric Schulte <schulte.eric@gmail.com> 32812010-11-11 Eric Schulte <schulte.eric@gmail.com>
3278 3282
@@ -3299,17 +3303,16 @@
3299 3303
33002010-11-11 Eric Schulte <schulte.eric@gmail.com> 33042010-11-11 Eric Schulte <schulte.eric@gmail.com>
3301 3305
3302 * ob-R.el (ess-make-buffer-current): Declared 3306 * ob-R.el (ess-make-buffer-current):
3303 (ess-ask-for-ess-directory): Declared 3307 Declared (ess-ask-for-ess-directory):
3304 (ess-local-process-name): Declared 3308 Declared (ess-local-process-name):
3305 3309 Declared * ob-latex.el (org-babel-latex-tex-to-pdf): Capturing free
3306 * ob-latex.el (org-babel-latex-tex-to-pdf): Capturing free
3307 variable 3310 variable
3308 3311
3309 * ob.el (org-edit-src-code): Fixing arguments 3312 * ob.el (org-edit-src-code): Fixing arguments
3310 (org-edit-src-exit): Declared 3313 (org-edit-src-exit):
3311 (org-outline-overlay-data): Declared 3314 Declared (org-outline-overlay-data):
3312 (org-set-outline-overlay-data): Declared. 3315 Declared (org-set-outline-overlay-data): Declared.
3313 3316
33142010-11-11 Glenn Morris <rgm@gnu.org> 33172010-11-11 Glenn Morris <rgm@gnu.org>
3315 3318
@@ -3337,7 +3340,7 @@
3337 3340
33382010-11-11 Eric Schulte <schulte.eric@gmail.com> 33412010-11-11 Eric Schulte <schulte.eric@gmail.com>
3339 3342
3340 * ob.el (org-babel-remove-temporary-directory): Removed explicit 3343 * ob.el (org-babel-remove-temporary-directory): Remove explicit
3341 second argument. 3344 second argument.
3342 3345
33432010-11-11 Magnus Henoch <magnus.henoch@gmail.com> (tiny change) 33462010-11-11 Magnus Henoch <magnus.henoch@gmail.com> (tiny change)
@@ -3347,7 +3350,7 @@
3347 3350
33482010-11-11 Eric Schulte <schulte.eric@gmail.com> 33512010-11-11 Eric Schulte <schulte.eric@gmail.com>
3349 3352
3350 * org-macs.el (org-save-outline-visibility): Moved from org.el. 3353 * org-macs.el (org-save-outline-visibility): Move from org.el.
3351 3354
33522010-11-11 Eric Schulte <schulte.eric@gmail.com> 33552010-11-11 Eric Schulte <schulte.eric@gmail.com>
3353 3356
@@ -3450,11 +3453,11 @@
3450 3453
34512010-11-11 Carsten Dominik <carsten.dominik@gmail.com> 34542010-11-11 Carsten Dominik <carsten.dominik@gmail.com>
3452 3455
3453 * org-latex.el (org-export-latex-set-initial-vars): Bind 3456 * org-latex.el (org-export-latex-set-initial-vars):
3454 `case-fold-search' to t around the search for special LaTeX setup. 3457 Bind `case-fold-search' to t around the search for special LaTeX setup.
3455 3458
3456 * org-beamer.el (org-beamer-after-initial-vars): Bind 3459 * org-beamer.el (org-beamer-after-initial-vars):
3457 `case-fold-search' to t around the search for special BEAMER 3460 Bind `case-fold-search' to t around the search for special BEAMER
3458 setup. 3461 setup.
3459 3462
34602010-11-11 David Maus <dmaus@ictsoc.de> 34632010-11-11 David Maus <dmaus@ictsoc.de>
@@ -3512,8 +3515,8 @@
3512 * org-feed.el (xml-substitute-special): Declare function for byte 3515 * org-feed.el (xml-substitute-special): Declare function for byte
3513 compiler. 3516 compiler.
3514 (org-feed-unescape): Removed. 3517 (org-feed-unescape): Removed.
3515 (org-feed-parse-rss-entry, org-feed-parse-atom-entry): Use 3518 (org-feed-parse-rss-entry, org-feed-parse-atom-entry):
3516 `xml-substitute-special' to unescape XML entities. 3519 Use `xml-substitute-special' to unescape XML entities.
3517 3520
35182010-11-11 Dan Davison <davison@stats.ox.ac.uk> 35212010-11-11 Dan Davison <davison@stats.ox.ac.uk>
3519 3522
@@ -3614,10 +3617,10 @@
3614 3617
36152010-11-11 Carsten Dominik <carsten.dominik@gmail.com> 36182010-11-11 Carsten Dominik <carsten.dominik@gmail.com>
3616 3619
3617 * org-agenda.el (org-agenda-before-sorting-filter-function): New 3620 * org-agenda.el (org-agenda-before-sorting-filter-function):
3618 hook function. 3621 New hook function.
3619 (org-finalize-agenda-entries): Apply 3622 (org-finalize-agenda-entries):
3620 `org-agenda-before-sorting-filter-function'. 3623 Apply `org-agenda-before-sorting-filter-function'.
3621 3624
36222010-11-11 Carsten Dominik <carsten.dominik@gmail.com> 36252010-11-11 Carsten Dominik <carsten.dominik@gmail.com>
3623 3626
@@ -3662,8 +3665,8 @@
3662 * org.el (org-preview-latex-fragment): Call `org-format-latex' 3665 * org.el (org-preview-latex-fragment): Call `org-format-latex'
3663 with the additional processing argument. 3666 with the additional processing argument.
3664 (org-export-have-math): New variable, for dynamic scoping. 3667 (org-export-have-math): New variable, for dynamic scoping.
3665 (org-format-latex): Implement specific ways of processing. New 3668 (org-format-latex): Implement specific ways of processing.
3666 function argument for processing type. 3669 New function argument for processing type.
3667 (org-org-menu): Remove the entry to configure LaTeX snippet 3670 (org-org-menu): Remove the entry to configure LaTeX snippet
3668 processing. 3671 processing.
3669 3672
@@ -3776,13 +3779,13 @@
3776 3779
37772010-11-11 Dan Davison <davison@stats.ox.ac.uk> 37802010-11-11 Dan Davison <davison@stats.ox.ac.uk>
3778 3781
3779 * ob-octave.el (org-babel-octave-evaluate-external-process): Allow 3782 * ob-octave.el (org-babel-octave-evaluate-external-process):
3780 remote files. 3783 Allow remote files.
3781 3784
37822010-11-11 Juan Pechiar <pechiar@computer.org> 37852010-11-11 Juan Pechiar <pechiar@computer.org>
3783 3786
3784 * ob-octave.el (org-babel-octave-evaluate-external-process): Use 3787 * ob-octave.el (org-babel-octave-evaluate-external-process):
3785 `org-babel-octave-import-elisp-from-file' instead of 3788 Use `org-babel-octave-import-elisp-from-file' instead of
3786 `org-babel-eval-read-file'. 3789 `org-babel-eval-read-file'.
3787 (org-babel-octave-var-to-octave): Separate matrix rows with ';', 3790 (org-babel-octave-var-to-octave): Separate matrix rows with ';',
3788 and use '%s' as format specifier instead of '%S'. 3791 and use '%s' as format specifier instead of '%S'.
@@ -3810,12 +3813,12 @@
3810 3813
3811 * org-latex.el (org-export-latex-tables): Add label if any 3814 * org-latex.el (org-export-latex-tables): Add label if any
3812 3815
3813 * org-latex.el (org-export-latex-convert-table.el-table): Fix 3816 * org-latex.el (org-export-latex-convert-table.el-table):
3814 little mistake when inserting label. 3817 Fix little mistake when inserting label.
3815 3818
38162010-11-11 Nicolas Goaziou <n.goaziou@gmail.com> 38192010-11-11 Nicolas Goaziou <n.goaziou@gmail.com>
3817 3820
3818 * org.el (org-cycle-internal-local): Removed an unnecessary call 3821 * org.el (org-cycle-internal-local): Remove an unnecessary call
3819 to `org-back-to-heading' that was preventing point to stay at its 3822 to `org-back-to-heading' that was preventing point to stay at its
3820 column when cycling visibility. 3823 column when cycling visibility.
3821 3824
@@ -3874,7 +3877,7 @@
3874 3877
38752010-11-11 Eric Schulte <schulte.eric@gmail.com> 38782010-11-11 Eric Schulte <schulte.eric@gmail.com>
3876 3879
3877 * ob-lob.el (org-babel-lob-one-liner-regexp): Fixed error in lob 3880 * ob-lob.el (org-babel-lob-one-liner-regexp): Fix error in lob
3878 regexp -- it wasn't matching lob lines w/o indices. 3881 regexp -- it wasn't matching lob lines w/o indices.
3879 3882
38802010-11-11 Eric Schulte <schulte.eric@gmail.com> 38832010-11-11 Eric Schulte <schulte.eric@gmail.com>
@@ -3910,13 +3913,13 @@
3910 3913
39112010-11-11 Eric Schulte <schulte.eric@gmail.com> 39142010-11-11 Eric Schulte <schulte.eric@gmail.com>
3912 3915
3913 * org-exp.el (org-export-format-source-code-or-example): Escape 3916 * org-exp.el (org-export-format-source-code-or-example):
3914 underscores in code block names on latex listings export. 3917 Escape underscores in code block names on latex listings export.
3915 3918
39162010-11-11 Eric Schulte <schulte.eric@gmail.com> 39192010-11-11 Eric Schulte <schulte.eric@gmail.com>
3917 3920
3918 * ob-tangle.el (org-babel-with-temp-filebuffer): Use 3921 * ob-tangle.el (org-babel-with-temp-filebuffer):
3919 find-file-noselect to avoid excess buffer movement. 3922 Use find-file-noselect to avoid excess buffer movement.
3920 3923
39212010-11-11 Carsten Dominik <carsten.dominik@gmail.com> 39242010-11-11 Carsten Dominik <carsten.dominik@gmail.com>
3922 3925
@@ -4235,11 +4238,11 @@
4235 4238
42362010-07-19 Carsten Dominik <carsten.dominik@gmail.com> 42392010-07-19 Carsten Dominik <carsten.dominik@gmail.com>
4237 4240
4238 * org-capture.el (org-capture-set-target-location): Store 4241 * org-capture.el (org-capture-set-target-location):
4239 exact positions for file+regexp and file+function targets. 4242 Store exact positions for file+regexp and file+function targets.
4240 (org-capture-place-entry, org-capture-place-item) 4243 (org-capture-place-entry, org-capture-place-item)
4241 (org-capture-place-table-line, org-capture-place-plain-text): Respect 4244 (org-capture-place-table-line, org-capture-place-plain-text):
4242 exact positions. 4245 Respect exact positions.
4243 (org-capture-finalize): Make sure we are at the beginning of a line 4246 (org-capture-finalize): Make sure we are at the beginning of a line
4244 when fixing the empty lines after the entry. 4247 when fixing the empty lines after the entry.
4245 4248
@@ -4260,21 +4263,21 @@
4260 4263
42612010-07-19 Eric Schulte <schulte.eric@gmail.com> 42642010-07-19 Eric Schulte <schulte.eric@gmail.com>
4262 4265
4263 * org-exp.el (org-export-attach-captions-and-attributes): Add 4266 * org-exp.el (org-export-attach-captions-and-attributes):
4264 a shortname attribute to caption strings under the symbol name 4267 Add a shortname attribute to caption strings under the symbol name
4265 org-caption-shortn. 4268 org-caption-shortn.
4266 4269
42672010-07-19 Carsten Dominik <carsten.dominik@gmail.com> 42702010-07-19 Carsten Dominik <carsten.dominik@gmail.com>
4268 4271
4269 * org.el (org-switchb): Rename from `org-iswitchb'. Improve 4272 * org.el (org-switchb): Rename from `org-iswitchb'.
4270 docstring. 4273 Improve docstring.
4271 (org-iswitchb): New alias. 4274 (org-iswitchb): New alias.
4272 (org-ido-switchb): Make alias point to `org-switchb'. 4275 (org-ido-switchb): Make alias point to `org-switchb'.
4273 4276
42742010-07-19 Carsten Dominik <carsten.dominik@gmail.com> 42772010-07-19 Carsten Dominik <carsten.dominik@gmail.com>
4275 4278
4276 * org-capture.el (org-capture-fill-template): Respect 4279 * org-capture.el (org-capture-fill-template):
4277 time-of-day preference in template prompt. 4280 Respect time-of-day preference in template prompt.
4278 4281
42792010-07-19 David Maus <dmaus@ictsoc.de> 42822010-07-19 David Maus <dmaus@ictsoc.de>
4280 4283
@@ -4289,8 +4292,8 @@
4289 4292
42902010-07-19 Carsten Dominik <carsten.dominik@gmail.com> 42932010-07-19 Carsten Dominik <carsten.dominik@gmail.com>
4291 4294
4292 * org-capture.el (org-capture-set-target-location): Fix 4295 * org-capture.el (org-capture-set-target-location):
4293 file+function interpretation. 4296 Fix file+function interpretation.
4294 4297
42952010-07-19 David Maus <dmaus@ictsoc.de> 42982010-07-19 David Maus <dmaus@ictsoc.de>
4296 4299
@@ -4304,8 +4307,8 @@
4304 4307
43052010-07-19 David Maus <dmaus@ictsoc.de> 43082010-07-19 David Maus <dmaus@ictsoc.de>
4306 4309
4307 * org-feed.el (org-feed-unescape): New function. Unescape 4310 * org-feed.el (org-feed-unescape): New function.
4308 protected entities. 4311 Unescape protected entities.
4309 (org-feed-parse-atom-entry): Use function for atom:content 4312 (org-feed-parse-atom-entry): Use function for atom:content
4310 type text and html. 4313 type text and html.
4311 4314
@@ -4326,8 +4329,8 @@
4326 4329
43272010-07-19 Carsten Dominik <carsten.dominik@gmail.com> 43302010-07-19 Carsten Dominik <carsten.dominik@gmail.com>
4328 4331
4329 * org-publish.el (org-publish-initialize-cache): Make 4332 * org-publish.el (org-publish-initialize-cache):
4330 timestamp directory, the entire path to it. 4333 Make timestamp directory, the entire path to it.
4331 4334
43322010-07-19 Carsten Dominik <carsten.dominik@gmail.com> 43352010-07-19 Carsten Dominik <carsten.dominik@gmail.com>
4333 4336
@@ -4382,15 +4385,15 @@
4382 (org-capture-bookmark-last-stored-position): New functions. 4385 (org-capture-bookmark-last-stored-position): New functions.
4383 (org-capture-place-table-line): Better error catching. 4386 (org-capture-place-table-line): Better error catching.
4384 (org-capture-place-item, org-capture-place-entry) 4387 (org-capture-place-item, org-capture-place-entry)
4385 (org-capture-place-plain-text): Call 4388 (org-capture-place-plain-text):
4386 `org-capture-position-for-last-stored'. 4389 Call `org-capture-position-for-last-stored'.
4387 (org-capture-finalize): Just call 4390 (org-capture-finalize): Just call
4388 `org-capture-bookmark-last-stored-position'. 4391 `org-capture-bookmark-last-stored-position'.
4389 4392
43902010-07-19 Eric Schulte <schulte.eric@gmail.com> 43932010-07-19 Eric Schulte <schulte.eric@gmail.com>
4391 4394
4392 * org-exp.el (org-export-mark-blockquote-verse-center): Fix 4395 * org-exp.el (org-export-mark-blockquote-verse-center):
4393 small bug, now grabbing match data before overwritten by looking-at 4396 Fix small bug, now grabbing match data before overwritten by looking-at
4394 this fixes a problem with remainders of #+end_quote lines appearing 4397 this fixes a problem with remainders of #+end_quote lines appearing
4395 in exported output. 4398 in exported output.
4396 4399
@@ -4563,8 +4566,8 @@
4563 4566
45642010-07-19 Eric Schulte <schulte.eric@gmail.com> 45672010-07-19 Eric Schulte <schulte.eric@gmail.com>
4565 4568
4566 * org-exp-blocks.el (org-export-blocks-postblock-hook): Add 4569 * org-exp-blocks.el (org-export-blocks-postblock-hook):
4567 documentation to and turn into a defcustom. 4570 Add documentation to and turn into a defcustom.
4568 4571
45692010-07-19 Eric Schulte <schulte.eric@gmail.com> 45722010-07-19 Eric Schulte <schulte.eric@gmail.com>
4570 4573
@@ -4653,8 +4656,8 @@
4653 4656
46542010-07-19 John Wiegley <jwiegley@gmail.com> 46572010-07-19 John Wiegley <jwiegley@gmail.com>
4655 4658
4656 * org-clock.el (org-clock-clock-in, org-clock-in): Add 4659 * org-clock.el (org-clock-clock-in, org-clock-in):
4657 parameter `start-time'. 4660 Add parameter `start-time'.
4658 (org-clock-resolve-clock): Add parameter `clock-out-time'. 4661 (org-clock-resolve-clock): Add parameter `clock-out-time'.
4659 If set, and resolve-to is a past time, then the clock out 4662 If set, and resolve-to is a past time, then the clock out
4660 event occurs at `clock-out-time' rather than at `resolve-to'. 4663 event occurs at `clock-out-time' rather than at `resolve-to'.
@@ -4699,8 +4702,8 @@
4699 * org-docbook.el (org-export-docbook-xslt-stylesheet): New option. 4702 * org-docbook.el (org-export-docbook-xslt-stylesheet): New option.
4700 (org-export-docbook-xslt-proc-command): Fix docstring. 4703 (org-export-docbook-xslt-proc-command): Fix docstring.
4701 (org-export-docbook-xsl-fo-proc-command): Fix docstring. 4704 (org-export-docbook-xsl-fo-proc-command): Fix docstring.
4702 (org-export-as-docbook-pdf): Improve 4705 (org-export-as-docbook-pdf):
4703 formatting of the xslt command. 4706 Improve formatting of the xslt command.
4704 4707
4705 * org-exp.el (org-infile-export-plist): Check for XSLT setting. 4708 * org-exp.el (org-infile-export-plist): Check for XSLT setting.
4706 4709
@@ -4709,8 +4712,8 @@
4709 4712
47102010-07-19 Carsten Dominik <carsten.dominik@gmail.com> 47132010-07-19 Carsten Dominik <carsten.dominik@gmail.com>
4711 4714
4712 * org-docbook.el (org-export-as-docbook-pdf): Improve 4715 * org-docbook.el (org-export-as-docbook-pdf):
4713 formatting of the xslt command. 4716 Improve formatting of the xslt command.
4714 4717
47152010-07-19 Sebastian Rose <sebastian_rose@gmx.de> 47182010-07-19 Sebastian Rose <sebastian_rose@gmx.de>
4716 4719
@@ -4727,8 +4730,8 @@
4727 4730
47282010-07-19 Carsten Dominik <carsten.dominik@gmail.com> 47312010-07-19 Carsten Dominik <carsten.dominik@gmail.com>
4729 4732
4730 * org.el (org-beginning-of-defun, org-end-of-defun): New 4733 * org.el (org-beginning-of-defun, org-end-of-defun):
4731 functions. 4734 New functions.
4732 (org-mode): Install the `org-beginning-of-defun' and 4735 (org-mode): Install the `org-beginning-of-defun' and
4733 `org-end-of-defun' functions. 4736 `org-end-of-defun' functions.
4734 (org-pretty-entities): New option. 4737 (org-pretty-entities): New option.
@@ -4785,8 +4788,8 @@
4785 4788
4786 * org.el (org-mode): Fix comment syntax settings. 4789 * org.el (org-mode): Fix comment syntax settings.
4787 4790
4788 * org-src.el (org-edit-src-allow-write-back-p): Define 4791 * org-src.el (org-edit-src-allow-write-back-p):
4789 variable. 4792 Define variable.
4790 4793
4791 * org.el (org-inline-image-overlays): New variable. 4794 * org.el (org-inline-image-overlays): New variable.
4792 (org-toggle-inline-images, org-display-inline-images) 4795 (org-toggle-inline-images, org-display-inline-images)
@@ -4795,8 +4798,8 @@
4795 4798
47962010-07-19 David Maus <dmaus@ictsoc.de> 47992010-07-19 David Maus <dmaus@ictsoc.de>
4797 4800
4798 * org-wl.el (org-wl-message-field): New function. Return 4801 * org-wl.el (org-wl-message-field): New function.
4799 content of header field in message entity. 4802 Return content of header field in message entity.
4800 (org-wl-store-link): Call `org-wl-store-link-folder' or 4803 (org-wl-store-link): Call `org-wl-store-link-folder' or
4801 `org-wl-store-link-message' depending on major-mode. 4804 `org-wl-store-link-message' depending on major-mode.
4802 (org-wl-store-link-folder): New function. Store link to 4805 (org-wl-store-link-folder): New function. Store link to
@@ -4845,8 +4848,8 @@
4845 4848
48462010-07-19 Carsten Dominik <carsten.dominik@gmail.com> 48492010-07-19 Carsten Dominik <carsten.dominik@gmail.com>
4847 4850
4848 * org-latex.el (org-export-latex-treat-sub-super-char): Make 4851 * org-latex.el (org-export-latex-treat-sub-super-char):
4849 sure parenthesis matching is consistent. 4852 Make sure parenthesis matching is consistent.
4850 4853
4851 * org-table.el (org-table-colgroup-line-p) 4854 * org-table.el (org-table-colgroup-line-p)
4852 (org-table-cookie-line-p): New functions. 4855 (org-table-cookie-line-p): New functions.
@@ -4866,8 +4869,8 @@
4866 * org-list.el (org-end-of-item-text-before-children): Also do 4869 * org-list.el (org-end-of-item-text-before-children): Also do
4867 the right thing at the end of a file. 4870 the right thing at the end of a file.
4868 4871
4869 * org.el (org-set-packages-alist, org-get-packages-alist): New 4872 * org.el (org-set-packages-alist, org-get-packages-alist):
4870 function. 4873 New function.
4871 (org-export-latex-default-packages-alist) 4874 (org-export-latex-default-packages-alist)
4872 (org-export-latex-packages-alist): Add extra flag to 4875 (org-export-latex-packages-alist): Add extra flag to
4873 each package, indicating if it should be used for snippets. 4876 each package, indicating if it should be used for snippets.
@@ -4906,8 +4909,8 @@
4906 * org-clock.el (org-clock-cancel, org-clock-out): Make sure 4909 * org-clock.el (org-clock-cancel, org-clock-out): Make sure
4907 the modeline display is removed. 4910 the modeline display is removed.
4908 4911
4909 * org-exp.el (org-export-format-drawer-function): Fix 4912 * org-exp.el (org-export-format-drawer-function):
4910 docstring. 4913 Fix docstring.
4911 4914
4912 * org-agenda.el (org-agenda-refile): New optional argument 4915 * org-agenda.el (org-agenda-refile): New optional argument
4913 NO-UPDATE. 4916 NO-UPDATE.
@@ -4923,21 +4926,21 @@
4923 * org-ascii.el (org-export-ascii-preprocess): Make table 4926 * org-ascii.el (org-export-ascii-preprocess): Make table
4924 mapping quiet. 4927 mapping quiet.
4925 4928
4926 * org-html.el (org-export-as-html, org-html-level-start): Change 4929 * org-html.el (org-export-as-html, org-html-level-start):
4927 XHTML IDs to not use dots. 4930 Change XHTML IDs to not use dots.
4928 4931
4929 * org-exp.el (org-export-define-heading-targets): Change 4932 * org-exp.el (org-export-define-heading-targets):
4930 XHTML IDs to not use dots. 4933 Change XHTML IDs to not use dots.
4931 4934
4932 * org-docbook.el (org-export-docbook-level-start): Change 4935 * org-docbook.el (org-export-docbook-level-start):
4933 XHTML IDs to not use dots. 4936 Change XHTML IDs to not use dots.
4934 4937
4935 * org-latex.el (org-export-as-latex): Make sure that the 4938 * org-latex.el (org-export-as-latex): Make sure that the
4936 result buffer is in latex-mode. 4939 result buffer is in latex-mode.
4937 4940
4938 * org.el (org-shiftup-final-hook, org-shiftdown-final-hook) 4941 * org.el (org-shiftup-final-hook, org-shiftdown-final-hook)
4939 (org-shiftleft-final-hook, org-shiftright-final-hook): New 4942 (org-shiftleft-final-hook, org-shiftright-final-hook):
4940 hooks. 4943 New hooks.
4941 4944
49422010-07-19 Carsten Dominik <carsten.dominik@gmail.com> 49452010-07-19 Carsten Dominik <carsten.dominik@gmail.com>
4943 4946
@@ -4990,8 +4993,8 @@
4990 4993
4991 * org-publish.el (org-publish-project-alist): Update docstring. 4994 * org-publish.el (org-publish-project-alist): Update docstring.
4992 (org-publish-file-title-cache): New variable. 4995 (org-publish-file-title-cache): New variable.
4993 (org-publish-initialize-files-alist): Initialize 4996 (org-publish-initialize-files-alist):
4994 `org-publish-initialize-files-alist' to nil. 4997 Initialize `org-publish-initialize-files-alist' to nil.
4995 (org-publish-sort-directory-files): New function. 4998 (org-publish-sort-directory-files): New function.
4996 (org-publish-projects): Access the new properties. 4999 (org-publish-projects): Access the new properties.
4997 (org-publish-find-title): Use the file title cache. 5000 (org-publish-find-title): Use the file title cache.
@@ -5076,8 +5079,8 @@
5076 5079
5077 * org-compat.el (org-make-overlay, org-delete-overlay) 5080 * org-compat.el (org-make-overlay, org-delete-overlay)
5078 (org-overlay-start, org-overlay-end, org-overlay-put) 5081 (org-overlay-start, org-overlay-end, org-overlay-put)
5079 (org-overlay-get, org-overlay-move, org-overlay-buffer): Functions 5082 (org-overlay-get, org-overlay-move, org-overlay-buffer):
5080 removed. 5083 Functions removed.
5081 (org-add-to-invisibility-spec): Function removed. 5084 (org-add-to-invisibility-spec): Function removed.
5082 5085
5083 * org-html.el (org-export-as-html-and-open): Add argument to 5086 * org-html.el (org-export-as-html-and-open): Add argument to
@@ -5152,8 +5155,8 @@
5152 5155
5153 * org-freemind.el (org-freemind-from-org-mode-node) 5156 * org-freemind.el (org-freemind-from-org-mode-node)
5154 (org-freemind-from-org-mode) 5157 (org-freemind-from-org-mode)
5155 (org-freemind-from-org-sparse-tree, org-freemind-to-org-mode): Use 5158 (org-freemind-from-org-sparse-tree, org-freemind-to-org-mode):
5156 interactive-p instead of called-interactively, because this is 5159 Use interactive-p instead of called-interactively, because this is
5157 backward compatible with older Emacsen I still support.. 5160 backward compatible with older Emacsen I still support..
5158 5161
51592010-07-19 Carsten Dominik <carsten.dominik@gmail.com> 51622010-07-19 Carsten Dominik <carsten.dominik@gmail.com>
@@ -5163,8 +5166,8 @@
5163 5166
51642010-07-19 Carsten Dominik <carsten.dominik@gmail.com> 51672010-07-19 Carsten Dominik <carsten.dominik@gmail.com>
5165 5168
5166 * org-footnote.el (org-footnote-goto-previous-reference): Rename 5169 * org-footnote.el (org-footnote-goto-previous-reference):
5167 from `org-footnote-goto-next-reference'. 5170 Rename from `org-footnote-goto-next-reference'.
5168 5171
5169 * org.el (org-auto-repeat-maybe): Only record LAST_REPEAT if 5172 * org.el (org-auto-repeat-maybe): Only record LAST_REPEAT if
5170 org-log-repeat is non-nil, or if there is clocking data in the 5173 org-log-repeat is non-nil, or if there is clocking data in the
@@ -5181,11 +5184,11 @@
5181 * org-wl.el (org-wl-link-remove-filter): New customizable 5184 * org-wl.el (org-wl-link-remove-filter): New customizable
5182 variable. If non-nil, filter conditions are stripped when storing 5185 variable. If non-nil, filter conditions are stripped when storing
5183 link to message in filter folder. 5186 link to message in filter folder.
5184 (org-wl-shimbun-prefer-web-links): New customizable variable. If 5187 (org-wl-shimbun-prefer-web-links): New customizable variable.
5185 non-nil, links to shimbun messages are created as web links to 5188 If non-nil, links to shimbun messages are created as web links to
5186 message source. 5189 message source.
5187 (org-wl-nntp-prefer-web-links): New customizable variable. If 5190 (org-wl-nntp-prefer-web-links): New customizable variable.
5188 non-nil, links to nntp message are created as web links to gmane 5191 If non-nil, links to nntp message are created as web links to gmane
5189 or googlegroups. 5192 or googlegroups.
5190 (org-wl-namazu-default-index): New customizable variable. 5193 (org-wl-namazu-default-index): New customizable variable.
5191 Directory of namazu search index that should be used as default 5194 Directory of namazu search index that should be used as default
@@ -5216,13 +5219,13 @@
5216 5219
5217 * org.el (org-file-apps-ex): New variable. 5220 * org.el (org-file-apps-ex): New variable.
5218 (org-open-file): Before considering org-file-apps, first match the 5221 (org-open-file): Before considering org-file-apps, first match the
5219 regexps from org-file-apps-ex against the whole link. See 5222 regexps from org-file-apps-ex against the whole link.
5220 docstring of org-file-apps-ex. 5223 See docstring of org-file-apps-ex.
5221 5224
52222010-07-19 Carsten Dominik <carsten.dominik@gmail.com> 52252010-07-19 Carsten Dominik <carsten.dominik@gmail.com>
5223 5226
5224 * org.el (org-export-latex-default-packages-alist): Remove 5227 * org.el (org-export-latex-default-packages-alist):
5225 microtype package. 5228 Remove microtype package.
5226 (org-todo-repeat-to-state): New variable. 5229 (org-todo-repeat-to-state): New variable.
5227 (org-auto-repeat-maybe): Allow user-selected target states. 5230 (org-auto-repeat-maybe): Allow user-selected target states.
5228 (org-default-properties): Add the new property REPEAT_TO_STATE. 5231 (org-default-properties): Add the new property REPEAT_TO_STATE.
@@ -5348,8 +5351,8 @@
5348 (org-mobile-copy-agenda-files, org-mobile-sumo-agenda-command) 5351 (org-mobile-copy-agenda-files, org-mobile-sumo-agenda-command)
5349 (org-mobile-create-sumo-agenda): Use encryption code. 5352 (org-mobile-create-sumo-agenda): Use encryption code.
5350 (org-mobile-encrypt-and-move): New function. 5353 (org-mobile-encrypt-and-move): New function.
5351 (org-mobile-encrypt-file, org-mobile-decrypt-file): New 5354 (org-mobile-encrypt-file, org-mobile-decrypt-file):
5352 functions. 5355 New functions.
5353 (org-mobile-move-capture): Decrypt the capture file. 5356 (org-mobile-move-capture): Decrypt the capture file.
5354 5357
5355 * org.el (org-entities): Require the new file. 5358 * org.el (org-entities): Require the new file.
@@ -5461,8 +5464,8 @@
5461 5464
54622010-04-10 Carsten Dominik <carsten.dominik@gmail.com> 54652010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
5463 5466
5464 * org-exp.el (org-export-author-info, org-export-email-info): Fix 5467 * org-exp.el (org-export-author-info, org-export-email-info):
5465 docstrings. 5468 Fix docstrings.
5466 5469
5467 * org-beamer.el (org-beamer-select-environment): Rename from 5470 * org-beamer.el (org-beamer-select-environment): Rename from
5468 `org-beamer-set-environment-tag'. Improve docstring. 5471 `org-beamer-set-environment-tag'. Improve docstring.
@@ -5571,8 +5574,8 @@
5571 5574
5572 * org-crypt.el (org-reveal-start-hook): Add a decryption function 5575 * org-crypt.el (org-reveal-start-hook): Add a decryption function
5573 to this hook. 5576 to this hook.
5574 (org-decrypt-entries, org-encrypt-entries, org-decrypt-entry): Add 5577 (org-decrypt-entries, org-encrypt-entries, org-decrypt-entry):
5575 docstrings. 5578 Add docstrings.
5576 5579
5577 * org.el (org-point-at-end-of-empty-headline) 5580 * org.el (org-point-at-end-of-empty-headline)
5578 (org-level-increment, org-get-previous-line-level): New function. 5581 (org-level-increment, org-get-previous-line-level): New function.
@@ -5600,8 +5603,8 @@
5600 5603
56012010-04-10 Stephen Eglen <stephen@gnu.org> 56042010-04-10 Stephen Eglen <stephen@gnu.org>
5602 5605
5603 * org-agenda.el (org-agenda-insert-diary-extract-time): New 5606 * org-agenda.el (org-agenda-insert-diary-extract-time):
5604 variable. 5607 New variable.
5605 (org-agenda-add-entry-to-org-agenda-diary-file): Use this new 5608 (org-agenda-add-entry-to-org-agenda-diary-file): Use this new
5606 variable rather than `org-agenda-search-headline-for-time'. 5609 variable rather than `org-agenda-search-headline-for-time'.
5607 5610
@@ -5704,8 +5707,8 @@
5704 (org-export-as-docbook): Fix problem with double footnote 5707 (org-export-as-docbook): Fix problem with double footnote
5705 reference in one place. 5708 reference in one place.
5706 5709
5707 * org-exp.el (org-export-format-source-code-or-example): Remove 5710 * org-exp.el (org-export-format-source-code-or-example):
5708 unnecessary newline. 5711 Remove unnecessary newline.
5709 5712
5710 * org.el (org-deadline, org-schedule): Allow rescheduling entries 5713 * org.el (org-deadline, org-schedule): Allow rescheduling entries
5711 with repeaters. 5714 with repeaters.
@@ -5727,8 +5730,8 @@
5727 5730
57282010-04-10 Carsten Dominik <carsten.dominik@gmail.com> 57312010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
5729 5732
5730 * org-latex.el (org-export-latex-classes): Add 5733 * org-latex.el (org-export-latex-classes):
5731 \usepackage{latexsym} to all classes. 5734 Add \usepackage{latexsym} to all classes.
5732 5735
57332010-04-10 Carsten Dominik <carsten.dominik@gmail.com> 57362010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
5734 5737
@@ -5747,8 +5750,8 @@
5747 5750
57482010-04-10 Carsten Dominik <carsten.dominik@gmail.com> 57512010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
5749 5752
5750 * org-clock.el (org-clock-report-include-clocking-task): New 5753 * org-clock.el (org-clock-report-include-clocking-task):
5751 option. 5754 New option.
5752 (org-clock-sum): Add the current clocking task. 5755 (org-clock-sum): Add the current clocking task.
5753 5756
57542010-04-10 Carsten Dominik <carsten.dominik@gmail.com> 57572010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
@@ -5784,8 +5787,8 @@
5784 (org-get-todo-face, org-font-lock-add-priority-faces) 5787 (org-get-todo-face, org-font-lock-add-priority-faces)
5785 (org-get-tag-face): Use `org-face-from-face-or-color'. 5788 (org-get-tag-face): Use `org-face-from-face-or-color'.
5786 5789
5787 * org-faces.el (org-todo-keyword-faces, org-priority-faces): Allow 5790 * org-faces.el (org-todo-keyword-faces, org-priority-faces):
5788 simple colors as values. 5791 Allow simple colors as values.
5789 (org-faces-easy-properties): New option. 5792 (org-faces-easy-properties): New option.
5790 5793
5791 * org-agenda.el (org-agenda-set-mode-name): Show if the agenda is 5794 * org-agenda.el (org-agenda-set-mode-name): Show if the agenda is
@@ -5807,8 +5810,8 @@
5807 * org-html.el (org-export-html-style-default): Add a default style 5810 * org-html.el (org-export-html-style-default): Add a default style
5808 for textareas. 5811 for textareas.
5809 5812
5810 * org-exp.el (org-export-format-source-code-or-example): Fix 5813 * org-exp.el (org-export-format-source-code-or-example):
5811 textarea tag. 5814 Fix textarea tag.
5812 5815
58132010-04-10 Bastien Guerry <bzg@altern.org> 58162010-04-10 Bastien Guerry <bzg@altern.org>
5814 5817
@@ -5838,8 +5841,8 @@
5838 * org-latex.el (org-export-as-pdf-and-open): Kill product buffer 5841 * org-latex.el (org-export-as-pdf-and-open): Kill product buffer
5839 if the user wants that. 5842 if the user wants that.
5840 5843
5841 * org-exp.el (org-export-kill-product-buffer-when-displayed): New 5844 * org-exp.el (org-export-kill-product-buffer-when-displayed):
5842 option. 5845 New option.
5843 5846
5844 * org-agenda.el (org-batch-agenda-csv): Use the time property 5847 * org-agenda.el (org-batch-agenda-csv): Use the time property
5845 instead of the `time-of-day' property. 5848 instead of the `time-of-day' property.
@@ -5894,8 +5897,8 @@
5894 * org.el (org-get-location): Make sure the selection buffer is 5897 * org.el (org-get-location): Make sure the selection buffer is
5895 shown in the current frame. 5898 shown in the current frame.
5896 5899
5897 * org-ascii.el (org-export-ascii-table-widen-columns): New 5900 * org-ascii.el (org-export-ascii-table-widen-columns):
5898 option. 5901 New option.
5899 (org-export-ascii-preprocess): Realign tables to remove narrowing 5902 (org-export-ascii-preprocess): Realign tables to remove narrowing
5900 if `org-export-ascii-table-widen-columns' is set. 5903 if `org-export-ascii-table-widen-columns' is set.
5901 5904
@@ -5920,8 +5923,8 @@
5920 5923
59212010-04-10 Carsten Dominik <carsten.dominik@gmail.com> 59242010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
5922 5925
5923 * org.el (org-fontify-meta-lines-and-blocks): Honor 5926 * org.el (org-fontify-meta-lines-and-blocks):
5924 `org-fontify-quote-and-verse-blocks'. 5927 Honor `org-fontify-quote-and-verse-blocks'.
5925 5928
5926 * org-faces.el (org-fontify-quote-and-verse-blocks): New option. 5929 * org-faces.el (org-fontify-quote-and-verse-blocks): New option.
5927 5930
@@ -5969,11 +5972,11 @@
5969 * org-latex.el (org-export-latex-make-header): Define the align 5972 * org-latex.el (org-export-latex-make-header): Define the align
5970 macro if it is not yet defined. 5973 macro if it is not yet defined.
5971 5974
5972 * org-agenda.el (org-agenda-insert-diary-make-new-entry): Call 5975 * org-agenda.el (org-agenda-insert-diary-make-new-entry):
5973 `org-insert-heading' with the INVISIBLE-OK argument. 5976 Call `org-insert-heading' with the INVISIBLE-OK argument.
5974 5977
5975 * org-mac-message.el (org-mac-message-insert-flagged): Call 5978 * org-mac-message.el (org-mac-message-insert-flagged):
5976 `org-insert-heading' with the INVISIBLE-OK argument. 5979 Call `org-insert-heading' with the INVISIBLE-OK argument.
5977 5980
5978 * org.el (org-insert-heading): New argument INVISIBLE-OK. 5981 * org.el (org-insert-heading): New argument INVISIBLE-OK.
5979 5982
@@ -5984,10 +5987,10 @@
5984 `html-container-class' text property to set an additional class 5987 `html-container-class' text property to set an additional class
5985 for an outline container. 5988 for an outline container.
5986 5989
5987 * org-exp.el (org-export-remember-html-container-classes): New 5990 * org-exp.el (org-export-remember-html-container-classes):
5988 function. 5991 New function.
5989 (org-export-preprocess-string): Call 5992 (org-export-preprocess-string):
5990 `org-export-remember-html-container-classes'. 5993 Call `org-export-remember-html-container-classes'.
5991 5994
5992 * org.el (org-cycle): Mention level cycling in the docstring. 5995 * org.el (org-cycle): Mention level cycling in the docstring.
5993 (org-default-properties): Add new property HTML_CONTAINER_CLASS. 5996 (org-default-properties): Add new property HTML_CONTAINER_CLASS.
@@ -6033,8 +6036,8 @@
6033 6036
6034 * org-clock.el (org-task-overrun-text): New option. 6037 * org-clock.el (org-task-overrun-text): New option.
6035 (org-task-overrun, org-clock-update-period): New variables. 6038 (org-task-overrun, org-clock-update-period): New variables.
6036 (org-clock-get-clock-string, org-clock-update-mode-line): Mark 6039 (org-clock-get-clock-string, org-clock-update-mode-line):
6037 overrun clock. 6040 Mark overrun clock.
6038 (org-clock-notify-once-if-expired): Check if clock is overrun. 6041 (org-clock-notify-once-if-expired): Check if clock is overrun.
6039 6042
6040 * org-faces.el: New face `org-mode-line-clock-overrun'. 6043 * org-faces.el: New face `org-mode-line-clock-overrun'.
@@ -6047,8 +6050,8 @@
6047 6050
60482010-04-10 Stephen Eglen <stephen@gnu.org> 60512010-04-10 Stephen Eglen <stephen@gnu.org>
6049 6052
6050 * org-agenda.el (org-get-time-of-day): Use 6053 * org-agenda.el (org-get-time-of-day):
6051 org-agenda-time-leading-zero to allow leading zero (rather than 6054 Use org-agenda-time-leading-zero to allow leading zero (rather than
6052 space) for times. 6055 space) for times.
6053 6056
60542010-04-10 Carsten Dominik <carsten.dominik@gmail.com> 60572010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
@@ -6095,8 +6098,8 @@
6095 6098
60962010-04-10 Carsten Dominik <carsten.dominik@gmail.com> 60992010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
6097 6100
6098 * org-agenda.el (org-diary-class): Use 6101 * org-agenda.el (org-diary-class):
6099 `org-order-calendar-date-args'. 6102 Use `org-order-calendar-date-args'.
6100 6103
6101 * org.el (org-order-calendar-date-args): New function. 6104 * org.el (org-order-calendar-date-args): New function.
6102 6105
@@ -6108,8 +6111,8 @@
6108 6111
6109 * org-agenda.el (org-agenda-schedule, org-agenda-deadline): 6112 * org-agenda.el (org-agenda-schedule, org-agenda-deadline):
6110 Document that ARG is passed through to remove the date. 6113 Document that ARG is passed through to remove the date.
6111 (org-agenda-bulk-action): Accept prefix arg and pass it on. Do 6114 (org-agenda-bulk-action): Accept prefix arg and pass it on.
6112 not read a date when the user has given a `C-u' prefix. 6115 Do not read a date when the user has given a `C-u' prefix.
6113 6116
61142010-04-10 Carsten Dominik <carsten.dominik@gmail.com> 61172010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
6115 6118
@@ -6157,8 +6160,8 @@
6157 have defined any. 6160 have defined any.
6158 (org-beamer-fix-toc): Put a frame around the table of contents. 6161 (org-beamer-fix-toc): Put a frame around the table of contents.
6159 6162
6160 * org-exp.el (org-export-remove-comment-blocks-and-subtrees): Make 6163 * org-exp.el (org-export-remove-comment-blocks-and-subtrees):
6161 sure case-folding works well when processing comment stuff. 6164 Make sure case-folding works well when processing comment stuff.
6162 6165
6163 * org-latex.el (org-export-latex-after-save-hook): New hook. 6166 * org-latex.el (org-export-latex-after-save-hook): New hook.
6164 (org-export-as-latex): Run the new hook. 6167 (org-export-as-latex): Run the new hook.
@@ -6344,8 +6347,8 @@
6344 6347
6345 * org.el (org-inhibit-startup-visibility-stuff): New variable. 6348 * org.el (org-inhibit-startup-visibility-stuff): New variable.
6346 (org-mode): Don't do startup visibility if inhibited. 6349 (org-mode): Don't do startup visibility if inhibited.
6347 (org-outline-overlay-data, org-set-outline-overlay-data): New 6350 (org-outline-overlay-data, org-set-outline-overlay-data):
6348 functions. 6351 New functions.
6349 (org-save-outline-visibility): New macro. 6352 (org-save-outline-visibility): New macro.
6350 (org-log-note-headings): Document that one should not change the 6353 (org-log-note-headings): Document that one should not change the
6351 `state' note format. 6354 `state' note format.
@@ -6374,42 +6377,42 @@
6374 * org-beamer.el: New file. 6377 * org-beamer.el: New file.
6375 6378
6376 * org-latex.el (org-export-latex-after-initial-vars-hook): New hook. 6379 * org-latex.el (org-export-latex-after-initial-vars-hook): New hook.
6377 (org-export-as-latex): Run 6380 (org-export-as-latex):
6378 `org-export-latex-after-initial-vars-hook'. 6381 Run `org-export-latex-after-initial-vars-hook'.
6379 (org-export-latex-format-toc-function) 6382 (org-export-latex-format-toc-function)
6380 (org-export-latex-make-header): Call 6383 (org-export-latex-make-header):
6381 `org-export-latex-format-toc-function'. 6384 Call `org-export-latex-format-toc-function'.
6382 6385
6383 * org.el (org-fill-template): Make template searches case sensitive. 6386 * org.el (org-fill-template): Make template searches case sensitive.
6384 6387
6385 * org-exp.el (org-export): Use "1" as a sign to export only the 6388 * org-exp.el (org-export): Use "1" as a sign to export only the
6386 subtree. 6389 subtree.
6387 6390
6388 * org-colview-xemacs.el (org-columns-edit-value): Use 6391 * org-colview-xemacs.el (org-columns-edit-value):
6389 org-unrestricted property. 6392 Use org-unrestricted property.
6390 6393
6391 * org-colview.el (org-columns-edit-value): Use 6394 * org-colview.el (org-columns-edit-value):
6392 org-unrestricted property. 6395 Use org-unrestricted property.
6393 6396
6394 * org.el (org-compute-property-at-point): Set org-unrestricted 6397 * org.el (org-compute-property-at-point): Set org-unrestricted
6395 text property if the list contains ":ETC". 6398 text property if the list contains ":ETC".
6396 (org-insert-property-drawer): Use 6399 (org-insert-property-drawer):
6397 org-unrestricted property. 6400 Use org-unrestricted property.
6398 6401
6399 * org-exp.el 6402 * org-exp.el
6400 (org-export-preprocess-before-selecting-backend-code-hook): New hook. 6403 (org-export-preprocess-before-selecting-backend-code-hook): New hook.
6401 (org-export-preprocess-string): Run 6404 (org-export-preprocess-string):
6402 `org-export-preprocess-before-selecting-backend-code-hook'. 6405 Run `org-export-preprocess-before-selecting-backend-code-hook'.
6403 6406
6404 * org-xoxo.el (org-export-as-xoxo): Run `org-export-first-hook'. 6407 * org-xoxo.el (org-export-as-xoxo): Run `org-export-first-hook'.
6405 6408
6406 * org-latex.el (org-export-region-as-latex): Run 6409 * org-latex.el (org-export-region-as-latex):
6407 `org-export-first-hook'. 6410 Run `org-export-first-hook'.
6408 6411
6409 * org-html.el (org-export-as-html): Run `org-export-first-hook'. 6412 * org-html.el (org-export-as-html): Run `org-export-first-hook'.
6410 6413
6411 * org-docbook.el (org-export-as-docbook): Run 6414 * org-docbook.el (org-export-as-docbook):
6412 `org-export-first-hook'. 6415 Run `org-export-first-hook'.
6413 6416
6414 * org-ascii.el (org-export-as-ascii): Run `org-export-first-hook'. 6417 * org-ascii.el (org-export-as-ascii): Run `org-export-first-hook'.
6415 6418
@@ -6447,8 +6450,8 @@
6447 6450
6448 * org-macs.el (org-re): Interpret :punct: in regexps. 6451 * org-macs.el (org-re): Interpret :punct: in regexps.
6449 6452
6450 * org-exp.el (org-export-replace-src-segments-and-examples): Also 6453 * org-exp.el (org-export-replace-src-segments-and-examples):
6451 take the final newline after the END line. 6454 Also take the final newline after the END line.
6452 6455
6453 * org.el (org-clean-visibility-after-subtree-move): Only fix 6456 * org.el (org-clean-visibility-after-subtree-move): Only fix
6454 entries that are not entirely invisible already. 6457 entries that are not entirely invisible already.
@@ -6457,8 +6460,8 @@
6457 6460
64582010-04-10 Carsten Dominik <carsten.dominik@gmail.com> 64612010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
6459 6462
6460 * org-exp.el (org-export-format-source-code-or-example): Avoid 6463 * org-exp.el (org-export-format-source-code-or-example):
6461 additional extra white lines in LaTeX. 6464 Avoid additional extra white lines in LaTeX.
6462 6465
6463 * org-list.el (org-list-parse-list): Leave empty lines after the 6466 * org-list.el (org-list-parse-list): Leave empty lines after the
6464 list, don't consider them as part of the list. 6467 list, don't consider them as part of the list.
@@ -6476,14 +6479,14 @@
6476 6479
64772010-04-10 Tassilo Horn <tassilo@member.fsf.org> 64802010-04-10 Tassilo Horn <tassilo@member.fsf.org>
6478 6481
6479 * org.el (org-complete-tags-always-offer-all-agenda-tags): New 6482 * org.el (org-complete-tags-always-offer-all-agenda-tags):
6480 variable. 6483 New variable.
6481 (org-set-tags): Use it. 6484 (org-set-tags): Use it.
6482 6485
64832010-04-10 Carsten Dominik <carsten.dominik@gmail.com> 64862010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
6484 6487
6485 * org-list.el (org-empty-line-terminates-plain-lists): Update 6488 * org-list.el (org-empty-line-terminates-plain-lists):
6486 docstring. 6489 Update docstring.
6487 6490
6488 * org.el (org-format-latex): Fix link creation for processed latex 6491 * org.el (org-format-latex): Fix link creation for processed latex
6489 snippets. 6492 snippets.
@@ -6539,8 +6542,8 @@
6539 6542
6540 * org-latex.el (org-export-latex-parse-global) 6543 * org-latex.el (org-export-latex-parse-global)
6541 (org-export-latex-parse-content) 6544 (org-export-latex-parse-content)
6542 (org-export-latex-parse-subcontent): Use 6545 (org-export-latex-parse-subcontent):
6543 `org-re-search-forward-unprotected'. 6546 Use `org-re-search-forward-unprotected'.
6544 (org-export-as-pdf): Remove log files produced by XeTeX. 6547 (org-export-as-pdf): Remove log files produced by XeTeX.
6545 6548
6546 * org-macs.el (org-re-search-forward-unprotected): New function. 6549 * org-macs.el (org-re-search-forward-unprotected): New function.
@@ -6573,8 +6576,8 @@
6573 6576
6574 * org.el (org-cycle-level): Use `org-looking-back'. 6577 * org.el (org-cycle-level): Use `org-looking-back'.
6575 6578
6576 * org-list.el (org-cycle-item-indentation): Use 6579 * org-list.el (org-cycle-item-indentation):
6577 `org-looking-back'. 6580 Use `org-looking-back'.
6578 6581
6579 * org-compat.el (org-looking-back): New function. 6582 * org-compat.el (org-looking-back): New function.
6580 6583
@@ -6627,8 +6630,8 @@
6627 6630
66282009-11-20 Carsten Dominik <carsten.dominik@gmail.com> 66312009-11-20 Carsten Dominik <carsten.dominik@gmail.com>
6629 6632
6630 * org-agenda.el (org-agenda-diary-entry-in-org-file): Rebuild 6633 * org-agenda.el (org-agenda-diary-entry-in-org-file):
6631 agenda after adding new entry. 6634 Rebuild agenda after adding new entry.
6632 6635
6633 * org-datetree.el (org-datetree-find-day-create): Fix regular 6636 * org-datetree.el (org-datetree-find-day-create): Fix regular
6634 expression. 6637 expression.
@@ -6665,8 +6668,8 @@
6665 6668
6666 * org-agenda.el (org-agenda-insert-diary-strategy): New variable. 6669 * org-agenda.el (org-agenda-insert-diary-strategy): New variable.
6667 (org-agenda-insert-diary-as-top-level): New function. 6670 (org-agenda-insert-diary-as-top-level): New function.
6668 (org-agenda-add-entry-to-org-agenda-diary-file): Call 6671 (org-agenda-add-entry-to-org-agenda-diary-file):
6669 `org-agenda-insert-diary-as-top-level'. 6672 Call `org-agenda-insert-diary-as-top-level'.
6670 6673
6671 * org.el (org-occur-in-agenda-files): Make sure none of the 6674 * org.el (org-occur-in-agenda-files): Make sure none of the
6672 buffers is narrowed. 6675 buffers is narrowed.
@@ -6733,8 +6736,8 @@
6733 6736
6734 * org-agenda.el (org-agenda-show-outline-path): New option. 6737 * org-agenda.el (org-agenda-show-outline-path): New option.
6735 (org-agenda-do-context-action): New function. 6738 (org-agenda-do-context-action): New function.
6736 (org-agenda-next-line, org-agenda-previous-line): Use 6739 (org-agenda-next-line, org-agenda-previous-line):
6737 `org-agenda-do-context-action'. 6740 Use `org-agenda-do-context-action'.
6738 6741
6739 * org.el (org-use-speed-commands): Allow function value. 6742 * org.el (org-use-speed-commands): Allow function value.
6740 (org-speed-commands-default): Make headline motion safe, so that 6743 (org-speed-commands-default): Make headline motion safe, so that
@@ -6811,8 +6814,8 @@
6811 * org-latex.el (org-export-latex-links): Check for protectedness 6814 * org-latex.el (org-export-latex-links): Check for protectedness
6812 in the last matched character, not after the match. 6815 in the last matched character, not after the match.
6813 6816
6814 * org-datetree.el (org-datetree-find-date-create): Respect 6817 * org-datetree.el (org-datetree-find-date-create):
6815 restriction when KEEP-RESTRICTION is set. 6818 Respect restriction when KEEP-RESTRICTION is set.
6816 (org-datetree-file-entry-under): New function. 6819 (org-datetree-file-entry-under): New function.
6817 (org-datetree-cleanup): New command. 6820 (org-datetree-cleanup): New command.
6818 6821
@@ -6850,8 +6853,8 @@
6850 * org-agenda.el (org-agenda-diary-entry-in-org-file) 6853 * org-agenda.el (org-agenda-diary-entry-in-org-file)
6851 (org-agenda-add-entry-to-org-agenda-diary-file) 6854 (org-agenda-add-entry-to-org-agenda-diary-file)
6852 (org-agenda-insert-diary-make-new-entry): New functions. 6855 (org-agenda-insert-diary-make-new-entry): New functions.
6853 (org-agenda-diary-entry): Call 6856 (org-agenda-diary-entry):
6854 `org-agenda-diary-entry-in-org-file' when appropriate. 6857 Call `org-agenda-diary-entry-in-org-file' when appropriate.
6855 6858
6856 * org.el (org-calendar-insert-diary-entry-key): New option. 6859 * org.el (org-calendar-insert-diary-entry-key): New option.
6857 (org-agenda-diary-file): New option. 6860 (org-agenda-diary-file): New option.
@@ -6902,8 +6905,8 @@
6902 6905
69032009-11-13 Dan Davison <davison@stats.ox.ac.uk> 69062009-11-13 Dan Davison <davison@stats.ox.ac.uk>
6904 6907
6905 * org-exp.el (org-export-format-source-code-or-example): Restrict 6908 * org-exp.el (org-export-format-source-code-or-example):
6906 scope of preserve-indentp to the let binding. 6909 Restrict scope of preserve-indentp to the let binding.
6907 (org-src): Require org-src, since org-src-preserve-indentation is used. 6910 (org-src): Require org-src, since org-src-preserve-indentation is used.
6908 6911
69092009-11-13 Carsten Dominik <carsten.dominik@gmail.com> 69122009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
@@ -6923,14 +6926,14 @@
6923 6926
69242009-11-13 Carsten Dominik <carsten.dominik@gmail.com> 69272009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
6925 6928
6926 * org-icalendar.el (org-print-icalendar-entries): Use 6929 * org-icalendar.el (org-print-icalendar-entries):
6927 org-icalendar-verify-function only if non-nil. 6930 Use org-icalendar-verify-function only if non-nil.
6928 6931
6929 * org.el (org-refile): Refile to clock only if the prefix arg is 6932 * org.el (org-refile): Refile to clock only if the prefix arg is
6930 2. 6933 2.
6931 (org-sparse-tree): Fix docstring to be in line with prompt. 6934 (org-sparse-tree): Fix docstring to be in line with prompt.
6932 (org-update-parent-todo-statistics): Call 6935 (org-update-parent-todo-statistics):
6933 `org-after-todo-statistics-hook' on each level. 6936 Call `org-after-todo-statistics-hook' on each level.
6934 6937
69352009-11-13 Carsten Dominik <carsten.dominik@gmail.com> 69382009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
6936 6939
@@ -6961,8 +6964,8 @@
6961 * org-clock.el (org-clock-play-sound): Expand file in 6964 * org-clock.el (org-clock-play-sound): Expand file in
6962 org-clock-sound, to allow ~ for home. 6965 org-clock-sound, to allow ~ for home.
6963 6966
6964 * org-remember.el (org-remember-handler): Set 6967 * org-remember.el (org-remember-handler):
6965 text-before-node-creation even if this already looks like a node, 6968 Set text-before-node-creation even if this already looks like a node,
6966 because the string might be needed on non-org-mode target files. 6969 because the string might be needed on non-org-mode target files.
6967 6970
6968 * org-agenda.el (org-agenda-open-link): Make this work in agenda 6971 * org-agenda.el (org-agenda-open-link): Make this work in agenda
@@ -6991,12 +6994,12 @@
6991 * org-src.el (org-src-preserve-indentation): Document that this 6994 * org-src.el (org-src-preserve-indentation): Document that this
6992 variable is also used during export. 6995 variable is also used during export.
6993 6996
6994 * org-exp.el (org-export-format-source-code-or-example): Preserve 6997 * org-exp.el (org-export-format-source-code-or-example):
6995 indentation if a block has a -i option, or if 6998 Preserve indentation if a block has a -i option, or if
6996 `org-src-preserve-indentation' is set. 6999 `org-src-preserve-indentation' is set.
6997 7000
6998 * org-exp-blocks.el (org-export-blocks-preprocess): Preserve 7001 * org-exp-blocks.el (org-export-blocks-preprocess):
6999 indentation if a block has a -i option, or if 7002 Preserve indentation if a block has a -i option, or if
7000 `org-src-preserve-indentation' is set. 7003 `org-src-preserve-indentation' is set.
7001 7004
70022009-11-13 Carsten Dominik <carsten.dominik@gmail.com> 70052009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
@@ -7013,8 +7016,8 @@
7013 (org-agenda-menu): Add the new archiving commands to the menu. 7016 (org-agenda-menu): Add the new archiving commands to the menu.
7014 (org-agenda-archive-default) 7017 (org-agenda-archive-default)
7015 (org-agenda-archive-default-with-confirmation): New commands. 7018 (org-agenda-archive-default-with-confirmation): New commands.
7016 (org-agenda-archive, org-agenda-archive-to-archive-sibling): Just 7019 (org-agenda-archive, org-agenda-archive-to-archive-sibling):
7017 call `org-agenda-archive-with'. 7020 Just call `org-agenda-archive-with'.
7018 (org-agenda-archive-with): New function. 7021 (org-agenda-archive-with): New function.
7019 7022
7020 * org-table.el (org-table-convert-region): Inert spaces around "|" 7023 * org-table.el (org-table-convert-region): Inert spaces around "|"
@@ -7034,8 +7037,8 @@
7034 IF-EXISTS, which avoids creating the attachment directory if it 7037 IF-EXISTS, which avoids creating the attachment directory if it
7035 does not yet exist. 7038 does not yet exist.
7036 7039
7037 * org-agenda.el (org-agenda, org-run-agenda-series): Evaluate 7040 * org-agenda.el (org-agenda, org-run-agenda-series):
7038 MATCH. 7041 Evaluate MATCH.
7039 7042
70402009-11-13 Carsten Dominik <carsten.dominik@gmail.com> 70432009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
7041 7044
@@ -7148,8 +7151,8 @@
7148 7151
71492009-11-13 John Wiegley <jwiegley@gmail.com> 71522009-11-13 John Wiegley <jwiegley@gmail.com>
7150 7153
7151 * org-clock.el (org-clock-display, org-clock-put-overlay): Use 7154 * org-clock.el (org-clock-display, org-clock-put-overlay):
7152 `org-time-clock-use-fractional'. 7155 Use `org-time-clock-use-fractional'.
7153 7156
7154 * org.el (org-time-clocksum-use-fractional) 7157 * org.el (org-time-clocksum-use-fractional)
7155 (org-time-clocksum-fractional-format): Two new customizable 7158 (org-time-clocksum-fractional-format): Two new customizable
@@ -7246,8 +7249,8 @@
7246 7249
7247 * org-agenda.el (org-agenda-next-line): New command. 7250 * org-agenda.el (org-agenda-next-line): New command.
7248 (org-agenda-previous-line): New commands. 7251 (org-agenda-previous-line): New commands.
7249 (org-agenda-show-and-scroll-up, org-agenda-show-scroll-down): New 7252 (org-agenda-show-and-scroll-up, org-agenda-show-scroll-down):
7250 commands. 7253 New commands.
7251 (org-agenda-follow-mode): Do the follow immediately if the mode is 7254 (org-agenda-follow-mode): Do the follow immediately if the mode is
7252 turned on here. 7255 turned on here.
7253 (previous-line, next-line): Replace keys with the corresponding 7256 (previous-line, next-line): Replace keys with the corresponding
@@ -7278,8 +7281,8 @@
7278 7281
72792009-11-13 John Wiegley <johnw@newartisans.com> 72822009-11-13 John Wiegley <johnw@newartisans.com>
7280 7283
7281 * org-clock.el (org-clock-disable-clock-resolution): New 7284 * org-clock.el (org-clock-disable-clock-resolution):
7282 customization variable that disable automatic clock resolution on 7285 New customization variable that disable automatic clock resolution on
7283 clock in. 7286 clock in.
7284 (org-clock-in): If `org-clock-disable-clock-resolution' is set, do 7287 (org-clock-in): If `org-clock-disable-clock-resolution' is set, do
7285 not automatically resolve anything. This is does not affect 7288 not automatically resolve anything. This is does not affect
@@ -7305,8 +7308,8 @@
7305 7308
73062009-11-13 John Wiegley <johnw@newartisans.com> 73092009-11-13 John Wiegley <johnw@newartisans.com>
7307 7310
7308 * org-agenda.el (org-agenda-auto-exclude-function): New 7311 * org-agenda.el (org-agenda-auto-exclude-function):
7309 customization variable for allowing the user to create an "auto 7312 New customization variable for allowing the user to create an "auto
7310 exclusion" filter for doing context-aware auto tag filtering. 7313 exclusion" filter for doing context-aware auto tag filtering.
7311 (org-agenda-filter-by-tag): Changes to support the use of 7314 (org-agenda-filter-by-tag): Changes to support the use of
7312 `org-agenda-auto-exclude-function'. See the new manual addition,. 7315 `org-agenda-auto-exclude-function'. See the new manual addition,.
@@ -7373,8 +7376,8 @@
7373 resolves a clock to a specific time, closing or resuming as need 7376 resolves a clock to a specific time, closing or resuming as need
7374 be, and possibly even starting a new clock. 7377 be, and possibly even starting a new clock.
7375 (org-clock-resolve): New function used by `org-resolve-clocks' 7378 (org-clock-resolve): New function used by `org-resolve-clocks'
7376 that sets up for the call to `org-clock-resolve-clock'. It 7379 that sets up for the call to `org-clock-resolve-clock'.
7377 determines the time to resolve to based on a single-character 7380 It determines the time to resolve to based on a single-character
7378 selection from the user to either keep time, subtract away time or 7381 selection from the user to either keep time, subtract away time or
7379 cancel the clock. 7382 cancel the clock.
7380 (org-resolve-clocks): New user command which resolves dangling 7383 (org-resolve-clocks): New user command which resolves dangling
@@ -7483,8 +7486,8 @@
74832009-11-13 Carsten Dominik <carsten.dominik@gmail.com> 74862009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
7484 7487
7485 * org-src.el (org-edit-src-code) 7488 * org-src.el (org-edit-src-code)
7486 (org-edit-src-find-region-and-lang, org-edit-src-exit): Handle 7489 (org-edit-src-find-region-and-lang, org-edit-src-exit):
7487 macro editing. 7490 Handle macro editing.
7488 7491
7489 * org-agenda.el (org-prefix-category-max-length): New variable. 7492 * org-agenda.el (org-prefix-category-max-length): New variable.
7490 (org-format-agenda-item): Use `org-prefix-category-max-length'. 7493 (org-format-agenda-item): Use `org-prefix-category-max-length'.
@@ -7637,12 +7640,12 @@
7637 (org-agenda-show-new-time, org-agenda-date-prompt) 7640 (org-agenda-show-new-time, org-agenda-date-prompt)
7638 (org-agenda-schedule, org-agenda-deadline, org-agenda-action) 7641 (org-agenda-schedule, org-agenda-deadline, org-agenda-action)
7639 (org-agenda-clock-in, org-agenda-bulk-mark) 7642 (org-agenda-clock-in, org-agenda-bulk-mark)
7640 (org-agenda-bulk-unmark, org-agenda-show-the-flagging-note): Use 7643 (org-agenda-bulk-unmark, org-agenda-show-the-flagging-note):
7641 `org-get-at-bol'. 7644 Use `org-get-at-bol'.
7642 7645
7643 * org-colview.el (org-columns-display-here) 7646 * org-colview.el (org-columns-display-here)
7644 (org-columns-edit-allowed, org-agenda-columns): Use 7647 (org-columns-edit-allowed, org-agenda-columns):
7645 `org-get-at-bol'. 7648 Use `org-get-at-bol'.
7646 7649
76472009-10-01 Carsten Dominik <carsten.dominik@gmail.com> 76502009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
7648 7651
@@ -7677,13 +7680,13 @@
7677 7680
76782009-10-01 Carsten Dominik <carsten.dominik@gmail.com> 76812009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
7679 7682
7680 * org-agenda.el (org-prepare-agenda): Reset 7683 * org-agenda.el (org-prepare-agenda):
7681 `org-drawers-for-agenda'. 7684 Reset `org-drawers-for-agenda'.
7682 (org-prepare-agenda): Uniquify list of drawers. 7685 (org-prepare-agenda): Uniquify list of drawers.
7683 7686
7684 * org.el (org-complex-heading-regexp-format): New variable. 7687 * org.el (org-complex-heading-regexp-format): New variable.
7685 (org-set-regexps-and-options): Define 7688 (org-set-regexps-and-options):
7686 `org-complex-heading-regexp-format'. 7689 Define `org-complex-heading-regexp-format'.
7687 (org-drawers-for-agenda): New variable. 7690 (org-drawers-for-agenda): New variable.
7688 (org-map-entries): Bind `org-drawers-for-agenda'. 7691 (org-map-entries): Bind `org-drawers-for-agenda'.
7689 (org-prepare-agenda-buffers): Add to `org-drawers-for-agenda'. 7692 (org-prepare-agenda-buffers): Add to `org-drawers-for-agenda'.
@@ -7728,10 +7731,10 @@
7728 * org-archive.el (org-archive-set-tag) 7731 * org-archive.el (org-archive-set-tag)
7729 (org-archive-subtree-default): New commands. 7732 (org-archive-subtree-default): New commands.
7730 7733
7731 * org-clock.el (org-clock-clocktable-default-properties): New 7734 * org-clock.el (org-clock-clocktable-default-properties):
7732 option. 7735 New option.
7733 (org-clock-report): Use 7736 (org-clock-report):
7734 `org-clock-clocktable-default-properties'. 7737 Use `org-clock-clocktable-default-properties'.
7735 7738
77362009-10-01 Carsten Dominik <carsten.dominik@gmail.com> 77392009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
7737 7740
@@ -7834,8 +7837,8 @@
7834 7837
78352009-10-01 Carsten Dominik <carsten.dominik@gmail.com> 78382009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
7836 7839
7837 * org-agenda.el (org-agenda-entry-text-exclude-regexps): New 7840 * org-agenda.el (org-agenda-entry-text-exclude-regexps):
7838 variable. 7841 New variable.
7839 (org-agenda-entry-text-cleanup-hook): New hook. 7842 (org-agenda-entry-text-cleanup-hook): New hook.
7840 (org-agenda-get-some-entry-text): Remove matches of 7843 (org-agenda-get-some-entry-text): Remove matches of
7841 `org-agenda-entry-text-exclude-regexps' and run the hook 7844 `org-agenda-entry-text-exclude-regexps' and run the hook
@@ -7985,8 +7988,8 @@
7985 7988
79862009-09-02 Carsten Dominik <carsten.dominik@gmail.com> 79892009-09-02 Carsten Dominik <carsten.dominik@gmail.com>
7987 7990
7988 * org.el (org-eval-in-calendar): Use 7991 * org.el (org-eval-in-calendar):
7989 `org-select-frame-set-input-focus'. 7992 Use `org-select-frame-set-input-focus'.
7990 7993
7991 * org-compat.el (org-select-frame-set-input-focus): New function. 7994 * org-compat.el (org-select-frame-set-input-focus): New function.
7992 7995
@@ -8032,8 +8035,8 @@
8032 (org-agenda-menu): Add effort setting commands to menu. 8035 (org-agenda-menu): Add effort setting commands to menu.
8033 (org-agenda-set-property, org-agenda-set-effort): New functions. 8036 (org-agenda-set-property, org-agenda-set-effort): New functions.
8034 8037
8035 * org-latex.el (org-export-latex-tables): Fix 8038 * org-latex.el (org-export-latex-tables):
8036 `org-table-last-alignment' and `org-table-last-column-widths' if 8039 Fix `org-table-last-alignment' and `org-table-last-column-widths' if
8037 the first column has been removed. 8040 the first column has been removed.
8038 8041
80392009-09-02 Carsten Dominik <carsten.dominik@gmail.com> 80422009-09-02 Carsten Dominik <carsten.dominik@gmail.com>
@@ -8055,8 +8058,8 @@
8055 (org-get-last-sibling): New function. 8058 (org-get-last-sibling): New function.
8056 (org-refile): Use `org-get-next-sibling' instead of the outline 8059 (org-refile): Use `org-get-next-sibling' instead of the outline
8057 version of this function. 8060 version of this function.
8058 (org-clean-visibility-after-subtree-move): Use 8061 (org-clean-visibility-after-subtree-move):
8059 `org-get-next-sibling' and `org-get-last-sibling' instead of the 8062 Use `org-get-next-sibling' and `org-get-last-sibling' instead of the
8060 outline versions of these functions. 8063 outline versions of these functions.
8061 8064
80622009-09-02 Carsten Dominik <carsten.dominik@gmail.com> 80652009-09-02 Carsten Dominik <carsten.dominik@gmail.com>
@@ -8084,8 +8087,8 @@
8084 (org-table-get-specials, org-table-rotate-recalc-marks) 8087 (org-table-get-specials, org-table-rotate-recalc-marks)
8085 (org-table-get-range, org-table-recalculate) 8088 (org-table-get-range, org-table-recalculate)
8086 (org-table-edit-formulas, org-table-fedit-convert-buffer) 8089 (org-table-edit-formulas, org-table-fedit-convert-buffer)
8087 (org-table-show-reference, org-table-highlight-rectangle): Don't 8090 (org-table-show-reference, org-table-highlight-rectangle):
8088 use `goto-line'. 8091 Don't use `goto-line'.
8089 8092
8090 * org-src.el (org-edit-src-code, org-edit-fixed-width-region) 8093 * org-src.el (org-edit-src-code, org-edit-fixed-width-region)
8091 (org-edit-src-exit): Don't use `goto-line'. 8094 (org-edit-src-exit): Don't use `goto-line'.
@@ -8100,8 +8103,8 @@
8100 * org-colview.el (org-columns, org-columns-redo) 8103 * org-colview.el (org-columns, org-columns-redo)
8101 (org-agenda-columns): Don't use `goto-line'. 8104 (org-agenda-columns): Don't use `goto-line'.
8102 8105
8103 * org-colview-xemacs.el (org-columns, org-agenda-columns): Don't 8106 * org-colview-xemacs.el (org-columns, org-agenda-columns):
8104 use `goto-line'. 8107 Don't use `goto-line'.
8105 8108
8106 * org-agenda.el (org-agenda-mode): Force visual line motion off. 8109 * org-agenda.el (org-agenda-mode): Force visual line motion off.
8107 (org-agenda-add-entry-text-maxlines): Improve docstring. 8110 (org-agenda-add-entry-text-maxlines): Improve docstring.
@@ -8143,8 +8146,8 @@
81432009-09-02 Carsten Dominik <carsten.dominik@gmail.com> 81462009-09-02 Carsten Dominik <carsten.dominik@gmail.com>
8144 8147
8145 * org-agenda.el (org-agenda-get-some-entry-text): New function. 8148 * org-agenda.el (org-agenda-get-some-entry-text): New function.
8146 (org-agenda-add-entry-text): Use 8149 (org-agenda-add-entry-text):
8147 `org-agenda-get-some-entry-text'. 8150 Use `org-agenda-get-some-entry-text'.
8148 8151
8149 * org.el (org-cycle-separator-lines): Update docstring. 8152 * org.el (org-cycle-separator-lines): Update docstring.
8150 (org-cycle-show-empty-lines): Handle negative values for 8153 (org-cycle-show-empty-lines): Handle negative values for
@@ -8172,8 +8175,8 @@
8172 8175
81732009-09-02 Carsten Dominik <carsten.dominik@gmail.com> 81762009-09-02 Carsten Dominik <carsten.dominik@gmail.com>
8174 8177
8175 * org-exp.el (org-export-format-source-code-or-example): Translate 8178 * org-exp.el (org-export-format-source-code-or-example):
8176 language. 8179 Translate language.
8177 8180
8178 * org-src.el (org-src-lang-modes): New variable. 8181 * org-src.el (org-src-lang-modes): New variable.
8179 (org-edit-src-code): Translate language. 8182 (org-edit-src-code): Translate language.
@@ -8199,8 +8202,8 @@
8199 8202
82002009-09-02 Carsten Dominik <carsten.dominik@gmail.com> 82032009-09-02 Carsten Dominik <carsten.dominik@gmail.com>
8201 8204
8202 * org-remember.el (org-remember-apply-template): Use 8205 * org-remember.el (org-remember-apply-template):
8203 org-icompleting-read. 8206 Use org-icompleting-read.
8204 8207
8205 * org-publish.el (org-publish): Use org-icompleting-read. 8208 * org-publish.el (org-publish): Use org-icompleting-read.
8206 8209
@@ -8208,11 +8211,11 @@
8208 (org-insert-columns-dblock): Use org-icompleting-read. 8211 (org-insert-columns-dblock): Use org-icompleting-read.
8209 8212
8210 * org-colview-xemacs.el (org-columns-edit-value) 8213 * org-colview-xemacs.el (org-columns-edit-value)
8211 (org-columns-new, org-insert-columns-dblock): Use 8214 (org-columns-new, org-insert-columns-dblock):
8212 org-icompleting-read. 8215 Use org-icompleting-read.
8213 8216
8214 * org-attach.el (org-attach-delete-one, org-attach-open): Use 8217 * org-attach.el (org-attach-delete-one, org-attach-open):
8215 org-icompleting-read. 8218 Use org-icompleting-read.
8216 8219
82172009-09-02 Carsten Dominik <carsten.dominik@gmail.com> 82202009-09-02 Carsten Dominik <carsten.dominik@gmail.com>
8218 8221
@@ -8221,8 +8224,8 @@
8221 (org-org-menu): Add a menu entry for the new bug reporter. 8224 (org-org-menu): Add a menu entry for the new bug reporter.
8222 (org-submit-bug-report): New command. 8225 (org-submit-bug-report): New command.
8223 8226
8224 * org-list.el (org-hierarchical-checkbox-statistics): Improve 8227 * org-list.el (org-hierarchical-checkbox-statistics):
8225 docstring. 8228 Improve docstring.
8226 8229
8227 * org.el (org-emphasis-regexp-components): Add "`" to set of 8230 * org.el (org-emphasis-regexp-components): Add "`" to set of
8228 pre-emphasis characters. 8231 pre-emphasis characters.
@@ -8231,16 +8234,16 @@
8231 package. 8234 package.
8232 (org-export-latex-emphasis-alist): Use \st for strikethough. 8235 (org-export-latex-emphasis-alist): Use \st for strikethough.
8233 8236
8234 * org-exp-blocks.el (org-export-blocks-preprocess): Use 8237 * org-exp-blocks.el (org-export-blocks-preprocess):
8235 `indent-code-rigidly' to indent. 8238 Use `indent-code-rigidly' to indent.
8236 8239
8237 * org-agenda.el (org-agenda-get-restriction-and-command): Remove 8240 * org-agenda.el (org-agenda-get-restriction-and-command):
8238 properties only if MATCH really is a string. 8241 Remove properties only if MATCH really is a string.
8239 8242
82402009-09-02 Carsten Dominik <carsten.dominik@gmail.com> 82432009-09-02 Carsten Dominik <carsten.dominik@gmail.com>
8241 8244
8242 * org-latex.el (org-export-latex-packages-alist): Fix 8245 * org-latex.el (org-export-latex-packages-alist):
8243 customization type. 8246 Fix customization type.
8244 8247
8245 * org.el (org-create-formula-image): Also use 8248 * org.el (org-create-formula-image): Also use
8246 `org-export-latex-packages-alist'. 8249 `org-export-latex-packages-alist'.
@@ -8253,8 +8256,8 @@
8253 * org.el (org-fast-tag-selection): Avoid text properties on tags 8256 * org.el (org-fast-tag-selection): Avoid text properties on tags
8254 in the alist. 8257 in the alist.
8255 8258
8256 * org-agenda.el (org-agenda-get-restriction-and-command): Avoid 8259 * org-agenda.el (org-agenda-get-restriction-and-command):
8257 text properties on the match element. 8260 Avoid text properties on the match element.
8258 8261
82592009-09-02 Carsten Dominik <carsten.dominik@gmail.com> 82622009-09-02 Carsten Dominik <carsten.dominik@gmail.com>
8260 8263
@@ -8278,8 +8281,8 @@
8278 8281
82792009-09-02 Carsten Dominik <carsten.dominik@gmail.com> 82822009-09-02 Carsten Dominik <carsten.dominik@gmail.com>
8280 8283
8281 * org.el (org-export-html-special-string-regexps): Definition 8284 * org.el (org-export-html-special-string-regexps):
8282 moved into org.el. 8285 Definition moved into org.el.
8283 8286
8284 * org-exp.el (org-export-preprocess-apply-macros): Allow newlines 8287 * org-exp.el (org-export-preprocess-apply-macros): Allow newlines
8285 in macro calls. 8288 in macro calls.
@@ -8289,8 +8292,8 @@
8289 * org-latex.el (org-export-latex-listings) 8292 * org-latex.el (org-export-latex-listings)
8290 (org-export-latex-listings-langs): New options. 8293 (org-export-latex-listings-langs): New options.
8291 8294
8292 * org-exp.el (org-export-format-source-code-or-example): Use 8295 * org-exp.el (org-export-format-source-code-or-example):
8293 listing package if requested by the user. 8296 Use listing package if requested by the user.
8294 8297
82952009-09-02 Bastien Guerry <bzg@altern.org> 82982009-09-02 Bastien Guerry <bzg@altern.org>
8296 8299
@@ -8313,8 +8316,8 @@
8313 * org.el (org-insert-heading): When respecting content, do not 8316 * org.el (org-insert-heading): When respecting content, do not
8314 convert current line to headline. 8317 convert current line to headline.
8315 8318
8316 * org-clock.el (org-clock-save-markers-for-cut-and-paste): Also 8319 * org-clock.el (org-clock-save-markers-for-cut-and-paste):
8317 cheeeeeck the hd marker. 8320 Also cheeeeeck the hd marker.
8318 (org-clock-in): Also set the hd marker. 8321 (org-clock-in): Also set the hd marker.
8319 (org-clock-out): Also set the hd marker. 8322 (org-clock-out): Also set the hd marker.
8320 (org-clock-cancel): Reset markers. 8323 (org-clock-cancel): Reset markers.
@@ -8329,8 +8332,8 @@
8329 * org.el (org-modules): Add org-track.el. 8332 * org.el (org-modules): Add org-track.el.
8330 8333
8331 * org-agenda.el (org-agenda-bulk-marked-p): New function. 8334 * org-agenda.el (org-agenda-bulk-marked-p): New function.
8332 (org-agenda-bulk-mark, org-agenda-bulk-unmark): Use 8335 (org-agenda-bulk-mark, org-agenda-bulk-unmark):
8333 `org-agenda-bulk-marked-p'. 8336 Use `org-agenda-bulk-marked-p'.
8334 (org-agenda-bulk-toggle): New command. 8337 (org-agenda-bulk-toggle): New command.
8335 8338
83362009-09-02 Carsten Dominik <carsten.dominik@gmail.com> 83392009-09-02 Carsten Dominik <carsten.dominik@gmail.com>
@@ -8396,8 +8399,8 @@
8396 8399
83972009-08-06 Carsten Dominik <carsten.dominik@gmail.com> 84002009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
8398 8401
8399 * org-list.el (org-list-send-list): Call 8402 * org-list.el (org-list-send-list):
8400 `org-list-goto-true-beginning' instead of 8403 Call `org-list-goto-true-beginning' instead of
8401 `org-list-find-true-beginning', which does not exist. 8404 `org-list-find-true-beginning', which does not exist.
8402 8405
8403 * org-timer.el (org-timer-reset-timers): Use `mapc'. 8406 * org-timer.el (org-timer-reset-timers): Use `mapc'.
@@ -8415,8 +8418,8 @@
8415 (org-startup-options): Add new options indent and noindent. 8418 (org-startup-options): Add new options indent and noindent.
8416 (org-unfontify-region): Remove line-prefix and wrap-prefix 8419 (org-unfontify-region): Remove line-prefix and wrap-prefix
8417 properties. 8420 properties.
8418 (org-after-demote-entry-hook, org-after-promote-entry-hook): New 8421 (org-after-demote-entry-hook, org-after-promote-entry-hook):
8419 hooks. 8422 New hooks.
8420 (org-promote, org-demote): Run the new hooks. 8423 (org-promote, org-demote): Run the new hooks.
8421 8424
8422 * org-table.el (org-table-align): Replace leading \n as well. 8425 * org-table.el (org-table-align): Replace leading \n as well.
@@ -8459,8 +8462,8 @@
8459 8462
84602009-08-06 Carsten Dominik <carsten.dominik@gmail.com> 84632009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
8461 8464
8462 * org-table.el (org-table-cut-region, org-table-copy-region): Work 8465 * org-table.el (org-table-cut-region, org-table-copy-region):
8463 on single field if no active region. 8466 Work on single field if no active region.
8464 8467
84652009-08-06 Carsten Dominik <carsten.dominik@gmail.com> 84682009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
8466 8469
@@ -8502,8 +8505,8 @@
8502 8505
8503 * org.el (org-store-link): Never store a link to an inline task. 8506 * org.el (org-store-link): Never store a link to an inline task.
8504 8507
8505 * org-footnote.el (org-footnote-goto-local-insertion-point): Skip 8508 * org-footnote.el (org-footnote-goto-local-insertion-point):
8506 inline tasks when positioning footnotes. 8509 Skip inline tasks when positioning footnotes.
8507 8510
8508 * org.el (org-refile): Remove the END line when archiving an 8511 * org.el (org-refile): Remove the END line when archiving an
8509 inline task that does have an END line. 8512 inline task that does have an END line.
@@ -8549,8 +8552,8 @@
8549 8552
85502009-08-06 Bastien Guerry <bzg@altern.org> 85532009-08-06 Bastien Guerry <bzg@altern.org>
8551 8554
8552 * org-protocol.el (org-protocol-default-template-key): New 8555 * org-protocol.el (org-protocol-default-template-key):
8553 option. 8556 New option.
8554 8557
8555 * org.el (org-refile): Bugfix: save-excursion before reading the 8558 * org.el (org-refile): Bugfix: save-excursion before reading the
8556 refile target, otherwise cursor moves might confuse `org-refile'. 8559 refile target, otherwise cursor moves might confuse `org-refile'.
@@ -8578,8 +8581,8 @@
8578 * org.el (org-mode-map): New key for org-timer-set-timer. 8581 * org.el (org-mode-map): New key for org-timer-set-timer.
8579 8582
8580 * org-timer.el (org-timer-reset-timers) 8583 * org-timer.el (org-timer-reset-timers)
8581 (org-timer-show-remaining-time, org-timer-set-timer): New 8584 (org-timer-show-remaining-time, org-timer-set-timer):
8582 functions. 8585 New functions.
8583 8586
8584 * org-clock.el (org-show-notification): Update the docstring. 8587 * org-clock.el (org-show-notification): Update the docstring.
8585 8588
@@ -8648,8 +8651,8 @@
8648 * org.el (org-get-refile-targets): Fix bug: don't ignore case when 8651 * org.el (org-get-refile-targets): Fix bug: don't ignore case when
8649 building the list of targets. 8652 building the list of targets.
8650 8653
8651 * org-remember.el (org-remember-delete-empty-lines-at-end): New 8654 * org-remember.el (org-remember-delete-empty-lines-at-end):
8652 option. 8655 New option.
8653 (org-remember-handler): Use the new option. 8656 (org-remember-handler): Use the new option.
8654 8657
86552009-08-06 James TD Smith <ahktenzero@mohorovi.cc> 86582009-08-06 James TD Smith <ahktenzero@mohorovi.cc>
@@ -8676,8 +8679,8 @@
8676 * org-latex.el (org-export-latex-first-lines): Fix problem with 8679 * org-latex.el (org-export-latex-first-lines): Fix problem with
8677 publishing the region. 8680 publishing the region.
8678 8681
8679 * org-exp.el (org-export-format-source-code-or-example): Fix 8682 * org-exp.el (org-export-format-source-code-or-example):
8680 bad line numbering when exporting examples in HTML. 8683 Fix bad line numbering when exporting examples in HTML.
8681 8684
86822009-08-06 James TD Smith <ahktenzero@mohorovi.cc> 86852009-08-06 James TD Smith <ahktenzero@mohorovi.cc>
8683 8686
@@ -8723,8 +8726,8 @@
8723 8726
8724 * org-exp.el (org-infile-export-plist): Read BIND lines. 8727 * org-exp.el (org-infile-export-plist): Read BIND lines.
8725 (org-install-letbind): New function. 8728 (org-install-letbind): New function.
8726 (org-export-as-org, org-export-preprocess-string): Call 8729 (org-export-as-org, org-export-preprocess-string):
8727 `org-install-letbind'. 8730 Call `org-install-letbind'.
8728 8731
8729 * org-list.el (org-list-demote-modify-bullet): New option. 8732 * org-list.el (org-list-demote-modify-bullet): New option.
8730 (org-first-list-item-p): Save point. 8733 (org-first-list-item-p): Save point.
@@ -8741,8 +8744,8 @@
8741 8744
8742 * org-footnote.el (org-footnote-auto-adjust): New option. 8745 * org-footnote.el (org-footnote-auto-adjust): New option.
8743 (org-footnote-auto-adjust-maybe): New function. 8746 (org-footnote-auto-adjust-maybe): New function.
8744 (org-footnote-new, org-footnote-delete): Call 8747 (org-footnote-new, org-footnote-delete):
8745 `org-footnote-auto-adjust-maybe'. 8748 Call `org-footnote-auto-adjust-maybe'.
8746 8749
8747 * org.el (org-startup-options): Add new footnote-related 8750 * org.el (org-startup-options): Add new footnote-related
8748 keywords. 8751 keywords.
@@ -8905,16 +8908,16 @@
8905 in column values. 8908 in column values.
8906 (org-columns-capture-view): Exclude comment and archived trees. 8909 (org-columns-capture-view): Exclude comment and archived trees.
8907 8910
8908 * org-colview-xemacs.el (org-columns-capture-view): Protect 8911 * org-colview-xemacs.el (org-columns-capture-view):
8909 vertical bars in column values. 8912 Protect vertical bars in column values.
8910 (org-columns-capture-view): Exclude comment and archived trees. 8913 (org-columns-capture-view): Exclude comment and archived trees.
8911 8914
8912 * org.el (org-quote-vert): New function. 8915 * org.el (org-quote-vert): New function.
8913 8916
8914 * org-latex.el (org-export-latex-verbatim-wrap): New option. 8917 * org-latex.el (org-export-latex-verbatim-wrap): New option.
8915 8918
8916 * org-exp.el (org-export-format-source-code-or-example): Use 8919 * org-exp.el (org-export-format-source-code-or-example):
8917 `org-export-latex-verbatim-wrap'. 8920 Use `org-export-latex-verbatim-wrap'.
8918 8921
8919 * org.el (org-clone-subtree-with-time-shift): Also shift inactive 8922 * org.el (org-clone-subtree-with-time-shift): Also shift inactive
8920 time stamps. 8923 time stamps.
@@ -8946,8 +8949,8 @@
8946 8949
89472009-08-06 Carsten Dominik <carsten.dominik@gmail.com> 89502009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
8948 8951
8949 * org-icalendar.el (org-icalendar-include-bbdb-anniversaries): New 8952 * org-icalendar.el (org-icalendar-include-bbdb-anniversaries):
8950 option. 8953 New option.
8951 (org-export-icalendar): Call `org-bbdb-anniv-export-ical'. 8954 (org-export-icalendar): Call `org-bbdb-anniv-export-ical'.
8952 8955
8953 * org-bbdb.el (org-bbdb-anniv-export-ical): New function. 8956 * org-bbdb.el (org-bbdb-anniv-export-ical): New function.
@@ -8969,8 +8972,8 @@
8969 * org-remember.el (org-remember-handler): Abort remember if the 8972 * org-remember.el (org-remember-handler): Abort remember if the
8970 buffer is empty. 8973 buffer is empty.
8971 8974
8972 * org-exp.el (org-export-format-source-code-or-example): Run 8975 * org-exp.el (org-export-format-source-code-or-example):
8973 `org-src-mode-hook'. 8976 Run `org-src-mode-hook'.
8974 8977
89752009-08-06 Carsten Dominik <carsten.dominik@gmail.com> 89782009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
8976 8979
@@ -8987,8 +8990,8 @@
8987 8990
8988 * org-macs.el (org-replace-match-keep-properties): New function. 8991 * org-macs.el (org-replace-match-keep-properties): New function.
8989 8992
8990 * org-exp.el (org-export-mark-blockquote-verse-center): Better 8993 * org-exp.el (org-export-mark-blockquote-verse-center):
8991 preprocessing of center and quote and verse blocks. 8994 Better preprocessing of center and quote and verse blocks.
8992 8995
8993 * org-list.el (org-list-end): Respect the stored "original" 8996 * org-list.el (org-list-end): Respect the stored "original"
8994 indentation when determining the end of the list. 8997 indentation when determining the end of the list.
@@ -9011,8 +9014,8 @@
9011 9014
90122009-08-06 Carsten Dominik <carsten.dominik@gmail.com> 90152009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
9013 9016
9014 * org-exp.el (org-export-format-source-code-or-example): Remember 9017 * org-exp.el (org-export-format-source-code-or-example):
9015 the original indentation of source code snippets and examples. 9018 Remember the original indentation of source code snippets and examples.
9016 9019
9017 * org-latex.el (org-export-as-latex): Relocate the table of 9020 * org-latex.el (org-export-as-latex): Relocate the table of
9018 contents. 9021 contents.
@@ -9088,35 +9091,35 @@
9088 (org-table-edit-formulas, orgtbl-ctrl-c-ctrl-c) 9091 (org-table-edit-formulas, orgtbl-ctrl-c-ctrl-c)
9089 (orgtbl-gather-send-defs): Allow indented #+TBLFM line. 9092 (orgtbl-gather-send-defs): Allow indented #+TBLFM line.
9090 9093
9091 * org.el (org-fontify-meta-lines, org-ctrl-c-ctrl-c): Allow 9094 * org.el (org-fontify-meta-lines, org-ctrl-c-ctrl-c):
9092 indented #+TBLFM line. 9095 Allow indented #+TBLFM line.
9093 9096
9094 * org-footnote.el (org-footnote-goto-local-insertion-point): Allow 9097 * org-footnote.el (org-footnote-goto-local-insertion-point):
9095 indented #+TBLFM line. 9098 Allow indented #+TBLFM line.
9096 9099
9097 * org-colview.el (org-dblock-write:columnview): Allow indented 9100 * org-colview.el (org-dblock-write:columnview): Allow indented
9098 #+TBLFM line. 9101 #+TBLFM line.
9099 9102
9100 * org-colview-xemacs.el (org-dblock-write:columnview): Allow 9103 * org-colview-xemacs.el (org-dblock-write:columnview):
9101 indented #+TBLFM line. 9104 Allow indented #+TBLFM line.
9102 9105
9103 * org-clock.el (org-dblock-write:clocktable): Allow indented 9106 * org-clock.el (org-dblock-write:clocktable): Allow indented
9104 #+TBLFM line. 9107 #+TBLFM line.
9105 9108
91062009-08-06 Carsten Dominik <carsten.dominik@gmail.com> 91092009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
9107 9110
9108 * org-exp.el (org-export-format-source-code-or-example): Make 9111 * org-exp.el (org-export-format-source-code-or-example):
9109 editing indented blocks work correctly. 9112 Make editing indented blocks work correctly.
9110 9113
9111 * org.el (org-edit-src-nindent): New variable. 9114 * org.el (org-edit-src-nindent): New variable.
9112 (org-edit-src-code, org-edit-fixed-width-region) 9115 (org-edit-src-code, org-edit-fixed-width-region)
9113 (org-edit-src-find-region-and-lang, org-edit-src-exit): Make 9116 (org-edit-src-find-region-and-lang, org-edit-src-exit):
9114 editing indented blocks work correctly. 9117 Make editing indented blocks work correctly.
9115 9118
91162009-08-06 Carsten Dominik <carsten.dominik@gmail.com> 91192009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
9117 9120
9118 * org-exp.el (org-export-replace-src-segments-and-examples): Find 9121 * org-exp.el (org-export-replace-src-segments-and-examples):
9119 indented blocks. 9122 Find indented blocks.
9120 (org-export-format-source-code-or-example): Fix indentation of 9123 (org-export-format-source-code-or-example): Fix indentation of
9121 blocks. 9124 blocks.
9122 (org-export-remove-indentation): New function. 9125 (org-export-remove-indentation): New function.
@@ -9135,18 +9138,18 @@
91352009-08-06 Carsten Dominik <carsten.dominik@gmail.com> 91382009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
9136 9139
9137 * org.el (org-treat-insert-todo-heading-as-state-change) 9140 * org.el (org-treat-insert-todo-heading-as-state-change)
9138 (org-treat-S-cursor-todo-selection-as-state-change): New 9141 (org-treat-S-cursor-todo-selection-as-state-change):
9139 variables. 9142 New variables.
9140 (org-insert-todo-heading): Honor 9143 (org-insert-todo-heading):
9141 `org-treat-insert-todo-heading-as-state-change'. 9144 Honor `org-treat-insert-todo-heading-as-state-change'.
9142 (org-shiftright, org-shiftleft): Honor 9145 (org-shiftright, org-shiftleft):
9143 `org-treat-S-cursor-todo-selection-as-state-change'. 9146 Honor `org-treat-S-cursor-todo-selection-as-state-change'.
9144 (org-inhibit-logging): New variable. 9147 (org-inhibit-logging): New variable.
9145 9148
91462009-08-06 Carsten Dominik <carsten.dominik@gmail.com> 91492009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
9147 9150
9148 * org-agenda.el (org-remove-subtree-entries-from-agenda): Reduce 9151 * org-agenda.el (org-remove-subtree-entries-from-agenda):
9149 range for marker position checking. 9152 Reduce range for marker position checking.
9150 9153
9151 * org-latex.el (org-export-latex-first-lines): Fix bug when 9154 * org-latex.el (org-export-latex-first-lines): Fix bug when
9152 exporting a region. 9155 exporting a region.
@@ -9169,8 +9172,8 @@
9169 * org-latex.el (org-export-latex-low-levels): Fix customization 9172 * org-latex.el (org-export-latex-low-levels): Fix customization
9170 type. 9173 type.
9171 9174
9172 * org.el (org-priority, org-shiftup, org-shiftdown): Disable 9175 * org.el (org-priority, org-shiftup, org-shiftdown):
9173 priority commands. 9176 Disable priority commands.
9174 9177
9175 * org-agenda.el (org-agenda-priority): Disable priority commands. 9178 * org-agenda.el (org-agenda-priority): Disable priority commands.
9176 9179
@@ -9185,17 +9188,17 @@
9185 * org-exp.el (org-export-push-to-kill-ring): New function. 9188 * org-exp.el (org-export-push-to-kill-ring): New function.
9186 (org-export-copy-to-kill-ring): New option. 9189 (org-export-copy-to-kill-ring): New option.
9187 9190
9188 * org-latex.el (org-export-as-latex): Call 9191 * org-latex.el (org-export-as-latex):
9189 `org-export-push-to-kill-ring'. 9192 Call `org-export-push-to-kill-ring'.
9190 9193
9191 * org-exp.el (org-export-show-temporary-export-buffer): New 9194 * org-exp.el (org-export-show-temporary-export-buffer):
9192 option. 9195 New option.
9193 9196
9194 * org-latex.el (org-export-as-latex): Use 9197 * org-latex.el (org-export-as-latex):
9195 `org-export-show-temporary-export-buffer'. 9198 Use `org-export-show-temporary-export-buffer'.
9196 9199
9197 * org-exp.el (org-export-show-temporary-export-buffer): New 9200 * org-exp.el (org-export-show-temporary-export-buffer):
9198 option. 9201 New option.
9199 (org-export-push-to-kill-ring): New function. 9202 (org-export-push-to-kill-ring): New function.
9200 9203
9201 * org-colview.el (org-columns-compile-map): New variable. 9204 * org-colview.el (org-columns-compile-map): New variable.
@@ -9258,8 +9261,8 @@
9258 * org-latex.el (org-export-latex-complex-heading-re): New variable. 9261 * org-latex.el (org-export-latex-complex-heading-re): New variable.
9259 (org-export-as-latex): Force the correct regexp in the 9262 (org-export-as-latex): Force the correct regexp in the
9260 preprocessor buffer. 9263 preprocessor buffer.
9261 (org-export-latex-set-initial-vars): Set 9264 (org-export-latex-set-initial-vars):
9262 `org-export-latex-complex-heading-re'. 9265 Set `org-export-latex-complex-heading-re'.
9263 9266
9264 * org-agenda.el (org-agenda-start-with-log-mode): New option. 9267 * org-agenda.el (org-agenda-start-with-log-mode): New option.
9265 (org-agenda-mode): Use `org-agenda-start-with-log-mode'. 9268 (org-agenda-mode): Use `org-agenda-start-with-log-mode'.
@@ -9342,8 +9345,8 @@
9342 * org-clock.el (org-clock-insert-selection-line): Fix prefious 9345 * org-clock.el (org-clock-insert-selection-line): Fix prefious
9343 patch. 9346 patch.
9344 9347
9345 * org.el (org-edit-src-code, org-edit-fixed-width-region): Use 9348 * org.el (org-edit-src-code, org-edit-fixed-width-region):
9346 separate buffer instead of indirect buffer to edit source code. 9349 Use separate buffer instead of indirect buffer to edit source code.
9347 (org-edit-src-exit): Make this function work with the new setup. 9350 (org-edit-src-exit): Make this function work with the new setup.
9348 9351
9349 * org-clock.el (org-clock-insert-selection-line): Make sure tasks 9352 * org-clock.el (org-clock-insert-selection-line): Make sure tasks
@@ -9365,8 +9368,8 @@
9365 9368
9366 * org-list.el (org-reset-checkbox-state-subtree): Move here from 9369 * org-list.el (org-reset-checkbox-state-subtree): Move here from
9367 org-checklist.el. 9370 org-checklist.el.
9368 (org-reset-checkbox-state-subtree): Call 9371 (org-reset-checkbox-state-subtree):
9369 `org-reset-checkbox-state-subtree'. 9372 Call `org-reset-checkbox-state-subtree'.
9370 9373
9371 * org-remember.el (org-select-remember-template): For the 9374 * org-remember.el (org-select-remember-template): For the
9372 selection of a valid template. 9375 selection of a valid template.
@@ -9434,11 +9437,11 @@
9434 * org.el (org-prepare-agenda-buffers): Catch a throw to nextfile. 9437 * org.el (org-prepare-agenda-buffers): Catch a throw to nextfile.
9435 9438
9436 * org-protocol.el: Remove dependency on url.el. 9439 * org-protocol.el: Remove dependency on url.el.
9437 (org-protocol-unhex-compound, org-protocol-open-source): Remove 9440 (org-protocol-unhex-compound, org-protocol-open-source):
9438 dependency on url.el. 9441 Remove dependency on url.el.
9439 9442
9440 * org-latex.el (org-export-as-pdf): Use 9443 * org-latex.el (org-export-as-pdf):
9441 `org-latex-to-pdf-process'. 9444 Use `org-latex-to-pdf-process'.
9442 9445
94432009-08-06 Carsten Dominik <carsten.dominik@gmail.com> 94462009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
9444 9447
@@ -9446,8 +9449,8 @@
9446 9449
9447 * org-agenda.el (org-agenda-skip-additional-timestamps-same-entry): 9450 * org-agenda.el (org-agenda-skip-additional-timestamps-same-entry):
9448 New option. 9451 New option.
9449 (org-agenda-get-timestamps): Honor 9452 (org-agenda-get-timestamps):
9450 `org-agenda-skip-additional-timestamps-same-entry'. 9453 Honor `org-agenda-skip-additional-timestamps-same-entry'.
9451 9454
9452 * org-clock.el (org-clock-goto-may-find-recent-task): New option. 9455 * org-clock.el (org-clock-goto-may-find-recent-task): New option.
9453 (org-clock-goto): Find recent task only if 9456 (org-clock-goto): Find recent task only if
@@ -9472,8 +9475,8 @@
9472 * org.el (org-tab-first-hook) 9475 * org.el (org-tab-first-hook)
9473 (org-tab-after-check-for-table-hook) 9476 (org-tab-after-check-for-table-hook)
9474 (org-tab-after-check-for-cycling-hook): New hooks. 9477 (org-tab-after-check-for-cycling-hook): New hooks.
9475 (org-cycle-internal-global, org-cycle-internal-local): New 9478 (org-cycle-internal-global, org-cycle-internal-local):
9476 functions, split out from `org-cycle'. 9479 New functions, split out from `org-cycle'.
9477 (org-cycle): Call the new hooks. 9480 (org-cycle): Call the new hooks.
9478 9481
94792009-08-06 Carsten Dominik <carsten.dominik@gmail.com> 94822009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
@@ -9481,13 +9484,13 @@
9481 * org-exp.el (org-export-preprocess-string): Reset the list of 9484 * org-exp.el (org-export-preprocess-string): Reset the list of
9482 preferred targets for each run of the preprocessor. 9485 preferred targets for each run of the preprocessor.
9483 9486
9484 * org.el (org-refile-target-verify-function): Improve 9487 * org.el (org-refile-target-verify-function):
9485 documentation. 9488 Improve documentation.
9486 (org-get-refile-targets): Respect point being moved by the 9489 (org-get-refile-targets): Respect point being moved by the
9487 verification function. 9490 verification function.
9488 9491
9489 * org-latex.el (org-export-latex-timestamp-keyword-markup): New 9492 * org-latex.el (org-export-latex-timestamp-keyword-markup):
9490 option. 9493 New option.
9491 (org-export-latex-keywords): Use new option. 9494 (org-export-latex-keywords): Use new option.
9492 9495
9493 * org.el (org-rear-nonsticky-at): New defsubst. 9496 * org.el (org-rear-nonsticky-at): New defsubst.
@@ -9500,8 +9503,8 @@
95002009-08-06 Carsten Dominik <carsten.dominik@gmail.com> 95032009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
9501 9504
9502 * org-protocol.el (server-edit): Declare `server-edit'. 9505 * org-protocol.el (server-edit): Declare `server-edit'.
9503 (org-protocol-unhex-string, org-protocol-unhex-compound): New 9506 (org-protocol-unhex-string, org-protocol-unhex-compound):
9504 functions. 9507 New functions.
9505 (org-protocol-check-filename-for-protocol): Call `server-edit'. 9508 (org-protocol-check-filename-for-protocol): Call `server-edit'.
9506 9509
9507 * org.el (org-default-properties): New default properteis for 9510 * org.el (org-default-properties): New default properteis for
@@ -9682,15 +9685,15 @@
9682 * org-agenda.el (org-agenda-confirm-kill) 9685 * org-agenda.el (org-agenda-confirm-kill)
9683 (org-agenda-custom-commands-local-options) 9686 (org-agenda-custom-commands-local-options)
9684 (org-timeline-show-empty-dates, org-agenda-ndays) 9687 (org-timeline-show-empty-dates, org-agenda-ndays)
9685 (org-agenda-start-on-weekday, org-scheduled-past-days): Fix 9688 (org-agenda-start-on-weekday, org-scheduled-past-days):
9686 customization type from number to integer. 9689 Fix customization type from number to integer.
9687 9690
96882009-08-06 Carsten Dominik <carsten.dominik@gmail.com> 96912009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
9689 9692
9690 * org-protocol.el: Declare some functions. 9693 * org-protocol.el: Declare some functions.
9691 9694
9692 * org-agenda.el (org-agenda-compare-effort): Honor 9695 * org-agenda.el (org-agenda-compare-effort):
9693 `org-sort-agenda-noeffort-is-high'. 9696 Honor `org-sort-agenda-noeffort-is-high'.
9694 (org-agenda-filter-by-tag, org-agenda-filter-make-matcher) 9697 (org-agenda-filter-by-tag, org-agenda-filter-make-matcher)
9695 (org-agenda-compare-effort): Implement the "?" operator for 9698 (org-agenda-compare-effort): Implement the "?" operator for
9696 finding entries without effort setting. 9699 finding entries without effort setting.
@@ -9793,8 +9796,8 @@
9793 9796
9794 * org-mac-message.el (org-mac-flagged-mail): New group. 9797 * org-mac-message.el (org-mac-flagged-mail): New group.
9795 (org-mac-mail-account): New variable. 9798 (org-mac-mail-account): New variable.
9796 (org-mac-create-flagged-mail, org-mac-insert-flagged-mail): New 9799 (org-mac-create-flagged-mail, org-mac-insert-flagged-mail):
9797 commands. 9800 New commands.
9798 9801
9799 * org-remember.el (org-remember-backup-directory): New variable. 9802 * org-remember.el (org-remember-backup-directory): New variable.
9800 (org-remember-apply-template): Write file to backup directory. 9803 (org-remember-apply-template): Write file to backup directory.
@@ -9807,15 +9810,15 @@
9807 9810
9808 * org-table.el (org-table-beginning-of-field) 9811 * org-table.el (org-table-beginning-of-field)
9809 (org-table-end-of-field): New commands. 9812 (org-table-end-of-field): New commands.
9810 (org-table-previous-field, org-table-beginning-of-field): Better 9813 (org-table-previous-field, org-table-beginning-of-field):
9811 error messages. 9814 Better error messages.
9812 (orgtbl-setup): Include `M-a' and `M-e'. 9815 (orgtbl-setup): Include `M-a' and `M-e'.
9813 9816
9814 * org.el (org-backward-sentence, org-forward-sentence): New 9817 * org.el (org-backward-sentence, org-forward-sentence):
9815 commands. 9818 New commands.
9816 9819
9817 * org-colview.el (org-colview-initial-truncate-line-value): New 9820 * org-colview.el (org-colview-initial-truncate-line-value):
9818 variable. 9821 New variable.
9819 (org-columns-remove-overlays): Restore the value of `truncate-lines'. 9822 (org-columns-remove-overlays): Restore the value of `truncate-lines'.
9820 (org-columns): Remember the value of `truncate-lines'. 9823 (org-columns): Remember the value of `truncate-lines'.
9821 9824
@@ -9871,11 +9874,11 @@
9871 sub-projects. 9874 sub-projects.
9872 (org-agenda-skip-entry-when-regexp-matches) 9875 (org-agenda-skip-entry-when-regexp-matches)
9873 (org-agenda-skip-entry-when-regexp-matches-in-subtree): New functions. 9876 (org-agenda-skip-entry-when-regexp-matches-in-subtree): New functions.
9874 (org-agenda-list-stuck-projects): Use 9877 (org-agenda-list-stuck-projects):
9875 `org-agenda-skip-entry-when-regexp-matches-in-subtree'. 9878 Use `org-agenda-skip-entry-when-regexp-matches-in-subtree'.
9876 9879
9877 * org-latex.el (org-export-latex-preprocess): Improve 9880 * org-latex.el (org-export-latex-preprocess):
9878 export of verses. 9881 Improve export of verses.
9879 9882
9880 * org-exp.el (org-export-as-html): Implement centering as a div 9883 * org-exp.el (org-export-as-html): Implement centering as a div
9881 rather than a paragraph. Do a better job with line-end in verse 9884 rather than a paragraph. Do a better job with line-end in verse
@@ -9890,8 +9893,8 @@
9890 * org-latex.el (org-export-latex-preprocess): Implement the 9893 * org-latex.el (org-export-latex-preprocess): Implement the
9891 centering markup. 9894 centering markup.
9892 9895
9893 * org-exp.el (org-export-mark-blockquote-verse-center): Rename 9896 * org-exp.el (org-export-mark-blockquote-verse-center):
9894 from `org-export-mark-blockquote-and-verse'. 9897 Rename from `org-export-mark-blockquote-and-verse'.
9895 (org-export-as-html): Implement the centering markup. 9898 (org-export-as-html): Implement the centering markup.
9896 9899
9897 * org-latex.el (org-export-latex-tables): Fix vertical 9900 * org-latex.el (org-export-latex-tables): Fix vertical
@@ -9917,16 +9920,16 @@
9917 9920
99182009-08-06 Carsten Dominik <carsten.dominik@gmail.com> 99212009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
9919 9922
9920 * org-latex.el (org-export-latex-emphasis-alist): Better 9923 * org-latex.el (org-export-latex-emphasis-alist):
9921 defaults for verbose emphasis. 9924 Better defaults for verbose emphasis.
9922 (org-export-latex-emph-format): New function. 9925 (org-export-latex-emph-format): New function.
9923 (org-export-latex-fontify): Call `org-export-latex-emph-format'. 9926 (org-export-latex-fontify): Call `org-export-latex-emph-format'.
9924 9927
9925 * org-agenda.el (org-agenda-menu): Add new commands to menu. 9928 * org-agenda.el (org-agenda-menu): Add new commands to menu.
9926 (org-agenda-do-date-later, org-agenda-do-date-earlier) 9929 (org-agenda-do-date-later, org-agenda-do-date-earlier)
9927 (org-agenda-date-later-minutes, org-agenda-date-earlier-minutes) 9930 (org-agenda-date-later-minutes, org-agenda-date-earlier-minutes)
9928 (org-agenda-date-later-hours, org-agenda-date-earlier-hours): New 9931 (org-agenda-date-later-hours, org-agenda-date-earlier-hours):
9929 commands. 9932 New commands.
9930 9933
9931 * org.el (org-timestamp-change): Move end-time along with start 9934 * org.el (org-timestamp-change): Move end-time along with start
9932 time. 9935 time.
@@ -9958,8 +9961,8 @@
9958 (org-publish-projects, org-publish-org-index): Change default anme 9961 (org-publish-projects, org-publish-org-index): Change default anme
9959 for the index of file names to "sitemap.org". 9962 for the index of file names to "sitemap.org".
9960 9963
9961 * org-latex.el (org-export-latex-tables): Use 9964 * org-latex.el (org-export-latex-tables):
9962 `org-split-string', for Emacs 21 compatibility. 9965 Use `org-split-string', for Emacs 21 compatibility.
9963 9966
99642009-08-06 Carsten Dominik <carsten.dominik@gmail.com> 99672009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
9965 9968
@@ -9975,10 +9978,10 @@
9975 (org-get-current-options): Add new keywords. 9978 (org-get-current-options): Add new keywords.
9976 (org-export-as-html): Publish description and keywords. 9979 (org-export-as-html): Publish description and keywords.
9977 9980
9978 * org-agenda.el (org-agenda-add-entry-text-descriptive-links): New 9981 * org-agenda.el (org-agenda-add-entry-text-descriptive-links):
9979 option. 9982 New option.
9980 (org-agenda-add-entry-text): Honor 9983 (org-agenda-add-entry-text):
9981 `org-agenda-add-entry-text-descriptive-links'. 9984 Honor `org-agenda-add-entry-text-descriptive-links'.
9982 9985
9983 * org-latex.el (org-export-latex-preprocess): Make all 9986 * org-latex.el (org-export-latex-preprocess): Make all
9984 external preprocess functions use a PARAMETER arg. 9987 external preprocess functions use a PARAMETER arg.
@@ -9997,8 +10000,8 @@
9997 `org-export-html-style-include-scripts'. 10000 `org-export-html-style-include-scripts'.
9998 (org-export-as-html): Honor new option 10001 (org-export-as-html): Honor new option
9999 `org-export-html-style-include-scripts'. 10002 `org-export-html-style-include-scripts'.
10000 (org-export-html-scripts, org-export-html-style-default): Fix 10003 (org-export-html-scripts, org-export-html-style-default):
10001 xml issues with the Safari browser. 10004 Fix xml issues with the Safari browser.
10002 10005
100032009-08-06 Carsten Dominik <carsten.dominik@gmail.com> 100062009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
10004 10007
@@ -10015,8 +10018,8 @@
10015 10018
100162009-08-06 Carsten Dominik <carsten.dominik@gmail.com> 100192009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
10017 10020
10018 * org-exp.el (org-export-format-source-code-or-example): Mark 10021 * org-exp.el (org-export-format-source-code-or-example):
10019 temporary buffer unmodified, so that it will be killed even if 10022 Mark temporary buffer unmodified, so that it will be killed even if
10020 mode like message mode has decided to assign a file name. 10023 mode like message mode has decided to assign a file name.
10021 10024
10022 * org.el (org-scan-tags): Improve tag inheritance. 10025 * org.el (org-scan-tags): Improve tag inheritance.
@@ -10035,8 +10038,8 @@
10035 * org.el (org-add-planning-info): Fix bug with looking for keyword 10038 * org.el (org-add-planning-info): Fix bug with looking for keyword
10036 only at column 0. 10039 only at column 0.
10037 10040
10038 * org-agenda.el (org-agenda-custom-commands-local-options): Add 10041 * org-agenda.el (org-agenda-custom-commands-local-options):
10039 option for tags filter preset. 10042 Add option for tags filter preset.
10040 (org-prepare-agenda): Store filter preset as a property on the 10043 (org-prepare-agenda): Store filter preset as a property on the
10041 filter variable. 10044 filter variable.
10042 (org-finalize-agenda): Call the filter, if there is a preset. 10045 (org-finalize-agenda): Call the filter, if there is a preset.
@@ -10055,8 +10058,8 @@
10055 (org-agenda-fontify-priorities): Rename from 10058 (org-agenda-fontify-priorities): Rename from
10056 org-fontify-priorities. 10059 org-fontify-priorities.
10057 10060
10058 * org.el (org-set-font-lock-defaults): Call 10061 * org.el (org-set-font-lock-defaults):
10059 `org-font-lock-add-priority-faces'. 10062 Call `org-font-lock-add-priority-faces'.
10060 (org-font-lock-add-priority-faces): New function. 10063 (org-font-lock-add-priority-faces): New function.
10061 10064
10062 * org-faces.el (org-set-tag-faces): New option. 10065 * org-faces.el (org-set-tag-faces): New option.
@@ -10113,8 +10116,8 @@
10113 * org.el (org-blank-before-new-entry): Mention the dependence on 10116 * org.el (org-blank-before-new-entry): Mention the dependence on
10114 `org-empty-line-terminates-plain-lists' in the docstring. 10117 `org-empty-line-terminates-plain-lists' in the docstring.
10115 10118
10116 * org-publish.el (org-publish-get-project-from-filename): New 10119 * org-publish.el (org-publish-get-project-from-filename):
10117 optional argument UP. Only find the top project if UP is set. 10120 New optional argument UP. Only find the top project if UP is set.
10118 (org-publish-current-project): Find the top encloding project. 10121 (org-publish-current-project): Find the top encloding project.
10119 10122
10120 * org-agenda.el (org-agenda-before-write-hook) 10123 * org-agenda.el (org-agenda-before-write-hook)
@@ -10128,15 +10131,15 @@
10128 10131
10129 * org-exp.el (org-export-ascii-links-to-notes): New option. 10132 * org-exp.el (org-export-ascii-links-to-notes): New option.
10130 (org-export-as-ascii): Handle links better. 10133 (org-export-as-ascii): Handle links better.
10131 (org-export-ascii-wrap, org-export-ascii-push-links): New 10134 (org-export-ascii-wrap, org-export-ascii-push-links):
10132 functions. 10135 New functions.
10133 10136
101342009-08-06 Carsten Dominik <carsten.dominik@gmail.com> 101372009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
10135 10138
10136 * org-agenda.el (org-agenda): Make prefix arg optional. 10139 * org-agenda.el (org-agenda): Make prefix arg optional.
10137 (org-agenda-search-headline-for-time): New option. 10140 (org-agenda-search-headline-for-time): New option.
10138 (org-format-agenda-item): Honor 10141 (org-format-agenda-item):
10139 `org-agenda-search-headline-for-time'. 10142 Honor `org-agenda-search-headline-for-time'.
10140 10143
10141 * org-table.el (orgtbl-self-insert-command): Cluster undo for 20 10144 * org-table.el (orgtbl-self-insert-command): Cluster undo for 20
10142 characters. 10145 characters.
@@ -10207,8 +10210,8 @@
10207 10210
102082009-02-19 Carsten Dominik <dominik@science.uva.nl> 102112009-02-19 Carsten Dominik <dominik@science.uva.nl>
10209 10212
10210 * org.el (org-block-todo-from-children-or-siblings): Use 10213 * org.el (org-block-todo-from-children-or-siblings):
10211 `org-up-heading-all' so that this will work correctly with hidden 10214 Use `org-up-heading-all' so that this will work correctly with hidden
10212 property drawers and entries. 10215 property drawers and entries.
10213 (org-end-of-line, org-beginning-of-line): Make prefix arg work, by 10216 (org-end-of-line, org-beginning-of-line): Make prefix arg work, by
10214 falling back to normal, default command. 10217 falling back to normal, default command.
@@ -10289,8 +10292,8 @@
10289 * org-exp.el (org-export-html-footnotes-section): Make the div id 10292 * org-exp.el (org-export-html-footnotes-section): Make the div id
10290 consistent. 10293 consistent.
10291 10294
10292 * org-export-latex.el (org-export-latex-classes): Remove 10295 * org-export-latex.el (org-export-latex-classes):
10293 paper size option from LaTeX classes. 10296 Remove paper size option from LaTeX classes.
10294 10297
102952009-01-31 Carsten Dominik <carsten.dominik@gmail.com> 102982009-01-31 Carsten Dominik <carsten.dominik@gmail.com>
10296 10299
@@ -10373,8 +10376,8 @@
10373 * org-agenda.el (org-agenda-todo): Call `org-todo' interactively, 10376 * org-agenda.el (org-agenda-todo): Call `org-todo' interactively,
10374 to get real errors from the blocker hook. 10377 to get real errors from the blocker hook.
10375 10378
10376 * org.el (org-shiftselect-error, org-call-for-shift-select): New 10379 * org.el (org-shiftselect-error, org-call-for-shift-select):
10377 functions. 10380 New functions.
10378 (org-set-visibility-according-to-property): Turn off the setting 10381 (org-set-visibility-according-to-property): Turn off the setting
10379 of `org-show-entry-below', to avoid overruling a FOLDED visibility 10382 of `org-show-entry-below', to avoid overruling a FOLDED visibility
10380 property. 10383 property.
@@ -10391,13 +10394,13 @@
10391 10394
10392 * org-footnote.el (org-footnote-normalize): Remove unnecessary 10395 * org-footnote.el (org-footnote-normalize): Remove unnecessary
10393 variable. 10396 variable.
10394 (org-insert-footnote-reference-near-definition): Remove 10397 (org-insert-footnote-reference-near-definition):
10395 unnecessary let form. 10398 Remove unnecessary let form.
10396 10399
103972009-01-26 Carsten Dominik <dominik@science.uva.nl> 104002009-01-26 Carsten Dominik <dominik@science.uva.nl>
10398 10401
10399 * org-export-latex.el (org-export-as-latex): Call 10402 * org-export-latex.el (org-export-as-latex):
10400 `org-export-latex-first-lines' with OPT-PLIST as a parameter. 10403 Call `org-export-latex-first-lines' with OPT-PLIST as a parameter.
10401 (org-export-latex-first-lines): New parameter OPT-PLIST. 10404 (org-export-latex-first-lines): New parameter OPT-PLIST.
10402 10405
10403 * org.el (org-yank): Tell `delete-selection-mode' about 10406 * org.el (org-yank): Tell `delete-selection-mode' about
@@ -10405,8 +10408,8 @@
10405 10408
10406 * org-faces.el (org-clock-overlay): Fix face definition. 10409 * org-faces.el (org-clock-overlay): Fix face definition.
10407 10410
10408 * org-export-latex.el (org-export-latex-first-lines): Pass 10411 * org-export-latex.el (org-export-latex-first-lines):
10409 timestamp and footnote parameters to the preprocessor. 10412 Pass timestamp and footnote parameters to the preprocessor.
10410 10413
10411 * org-exp.el (org-export-remove-timestamps): Do not remove time 10414 * org-exp.el (org-export-remove-timestamps): Do not remove time
10412 stamps inside tables. 10415 stamps inside tables.
@@ -10415,8 +10418,8 @@
10415 10418
10416 * org-exp.el (org-export-as-html): Turn \par into a paragraph. 10419 * org-exp.el (org-export-as-html): Turn \par into a paragraph.
10417 10420
10418 * org.el (org-agenda-tags-todo-honor-ignore-options): Declare 10421 * org.el (org-agenda-tags-todo-honor-ignore-options):
10419 variable. 10422 Declare variable.
10420 10423
10421 * org-table.el (org-table-insert-hline): Fix typo in fuction call 10424 * org-table.el (org-table-insert-hline): Fix typo in fuction call
10422 to `backward-char'. 10425 to `backward-char'.
@@ -10424,21 +10427,21 @@
10424 * org-exp.el (org-export-as-html): Remove the initial space from 10427 * org-exp.el (org-export-as-html): Remove the initial space from
10425 colon examples. 10428 colon examples.
10426 10429
10427 * org.el (org-scan-tags): Call 10430 * org.el (org-scan-tags):
10428 `org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item'. 10431 Call `org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item'.
10429 10432
10430 * org-agenda.el (org-agenda-todo-list, org-agenda-match-view): New 10433 * org-agenda.el (org-agenda-todo-list, org-agenda-match-view):
10431 customization groups. 10434 New customization groups.
10432 (org-agenda-tags-todo-honor-ignore-options): New option. 10435 (org-agenda-tags-todo-honor-ignore-options): New option.
10433 (org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item): 10436 (org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item):
10434 New function. 10437 New function.
10435 (org-agenda-get-todos): Use 10438 (org-agenda-get-todos):
10436 `org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item'. 10439 Use `org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item'.
10437 10440
104382009-01-25 Carsten Dominik <carsten.dominik@gmail.com> 104412009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
10439 10442
10440 * org-exp.el (org-export-format-source-code-or-example): Escape 10443 * org-exp.el (org-export-format-source-code-or-example):
10441 HTML characters also in examples that anre not treated with 10444 Escape HTML characters also in examples that anre not treated with
10442 htmlize. Also, just switch to EXAMPLE processing if we do not 10445 htmlize. Also, just switch to EXAMPLE processing if we do not
10443 have a good version of htmlize. 10446 have a good version of htmlize.
10444 10447
@@ -10494,8 +10497,8 @@
10494 10497
104952009-01-25 Carsten Dominik <carsten.dominik@gmail.com> 104982009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
10496 10499
10497 * org-export-latex.el (org-export-latex-quotation-marks): Use 10500 * org-export-latex.el (org-export-latex-quotation-marks):
10498 `org-if-unprotected-1'. 10501 Use `org-if-unprotected-1'.
10499 (org-export-latex-set-initial-vars): Check for class definition in 10502 (org-export-latex-set-initial-vars): Check for class definition in
10500 property. 10503 property.
10501 10504
@@ -10505,8 +10508,8 @@
10505 10508
10506 * org-compat.el (org-count-lines): New function. 10509 * org-compat.el (org-count-lines): New function.
10507 10510
10508 * org-exp.el (org-export-format-source-code-or-example): Handle 10511 * org-exp.el (org-export-format-source-code-or-example):
10509 switches related to text areas. 10512 Handle switches related to text areas.
10510 10513
10511 * org.el (org-activate-footnote-links): Don't allow match inside a 10514 * org.el (org-activate-footnote-links): Don't allow match inside a
10512 link. 10515 link.
@@ -10541,17 +10544,17 @@
10541 * org.el (org-image-file-name-regexp, org-file-image-p): Allow the 10544 * org.el (org-image-file-name-regexp, org-file-image-p): Allow the
10542 list of extensions to be a parameter. 10545 list of extensions to be a parameter.
10543 10546
10544 * org-exp.el (org-export-html-inline-image-extensions): New 10547 * org-exp.el (org-export-html-inline-image-extensions):
10545 variable. 10548 New variable.
10546 10549
10547 * org-agenda.el (org-prepare-agenda): Use 10550 * org-agenda.el (org-prepare-agenda):
10548 `org-agenda-block-separator'. 10551 Use `org-agenda-block-separator'.
10549 (org-agenda-block-separator): New option. 10552 (org-agenda-block-separator): New option.
10550 10553
105512009-01-25 Carsten Dominik <carsten.dominik@gmail.com> 105542009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
10552 10555
10553 * org-export-latex.el (org-export-latex-tables): Call 10556 * org-export-latex.el (org-export-latex-tables):
10554 `org-table-clean-before-export' with the new optional argument. 10557 Call `org-table-clean-before-export' with the new optional argument.
10555 10558
10556 * org-exp.el (org-table-clean-before-export): New optional 10559 * org-exp.el (org-table-clean-before-export): New optional
10557 parameter MAYBE-QUOTED, allows for quoted characters like \# in 10560 parameter MAYBE-QUOTED, allows for quoted characters like \# in
@@ -10562,8 +10565,8 @@
10562 * org-plot.el (org-plot/gnuplot): Fix text-ind parameter for 10565 * org-plot.el (org-plot/gnuplot): Fix text-ind parameter for
10563 histograms. 10566 histograms.
10564 10567
10565 * org-colview.el (org-colview-construct-allowed-dates): Better 10568 * org-colview.el (org-colview-construct-allowed-dates):
10566 error catching when a date/time property does not have allowed 10569 Better error catching when a date/time property does not have allowed
10567 values defined. 10570 values defined.
10568 10571
10569 * org-colview-xemacs.el (org-colview-construct-allowed-dates): 10572 * org-colview-xemacs.el (org-colview-construct-allowed-dates):
@@ -10592,8 +10595,8 @@
10592 10595
105932009-01-25 Carsten Dominik <carsten.dominik@gmail.com> 105962009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
10594 10597
10595 * org-compat.el (org-fit-window-to-buffer): Use 10598 * org-compat.el (org-fit-window-to-buffer):
10596 `window-full-width-p'. 10599 Use `window-full-width-p'.
10597 10600
10598 * org-export-latex.el (org-export-latex-fixed-width): Enforce the 10601 * org-export-latex.el (org-export-latex-fixed-width): Enforce the
10599 space after the colon in short examples. 10602 space after the colon in short examples.
@@ -10649,8 +10652,8 @@
10649 (org-timer-stop): New command. 10652 (org-timer-stop): New command.
10650 (org-timer-seconds): Return correct time when timer is paused. 10653 (org-timer-seconds): Return correct time when timer is paused.
10651 (org-timer-mode-line-timer): New variable. 10654 (org-timer-mode-line-timer): New variable.
10652 (org-timer-set-mode-line, org-timer-update-mode-line): New 10655 (org-timer-set-mode-line, org-timer-update-mode-line):
10653 functions. 10656 New functions.
10654 10657
10655 * org.el (org-insert-heading): Handle new value `auto' for 10658 * org.el (org-insert-heading): Handle new value `auto' for
10656 `org-blank-before-new-entry'. 10659 `org-blank-before-new-entry'.
@@ -10699,19 +10702,19 @@
10699 10702
10700 * org-exp.el (org-export-preprocess-string): Remove clock lines 10703 * org-exp.el (org-export-preprocess-string): Remove clock lines
10701 and timestamps already in the preprocesor. 10704 and timestamps already in the preprocesor.
10702 (org-export-remove-timestamps, org-export-remove-clock-lines): New 10705 (org-export-remove-timestamps, org-export-remove-clock-lines):
10703 functions. 10706 New functions.
10704 (org-export-as-ascii, org-export-as-html): Add the timestamps 10707 (org-export-as-ascii, org-export-as-html): Add the timestamps
10705 parameter to the preprocessor parameter list. 10708 parameter to the preprocessor parameter list.
10706 10709
10707 * org-list.el (org-list-parse-list): Parse for checkboxes. 10710 * org-list.el (org-list-parse-list): Parse for checkboxes.
10708 (org-list-to-generic): Introduce and handle new parameters :cbon 10711 (org-list-to-generic): Introduce and handle new parameters :cbon
10709 and :cboff. 10712 and :cboff.
10710 (org-list-to-latex, org-list-to-html, org-list-to-texinfo): Add 10713 (org-list-to-latex, org-list-to-html, org-list-to-texinfo):
10711 optional parameter PARAMS. 10714 Add optional parameter PARAMS.
10712 10715
10713 * org-export-latex.el (org-export-latex-special-chars): Fix 10716 * org-export-latex.el (org-export-latex-special-chars):
10714 problems with interpreting dollar signs. 10717 Fix problems with interpreting dollar signs.
10715 (org-inside-latex-math-p): New function. 10718 (org-inside-latex-math-p): New function.
10716 (org-export-latex-preprocess): Protect all the math fragments. 10719 (org-export-latex-preprocess): Protect all the math fragments.
10717 10720
@@ -10723,8 +10726,8 @@
10723 * org-agenda.el (org-run-agenda-series): Have series options set 10726 * org-agenda.el (org-run-agenda-series): Have series options set
10724 when finalizing the agenda. 10727 when finalizing the agenda.
10725 10728
10726 * org-exp.el (org-export-format-source-code-or-example): Protect 10729 * org-exp.el (org-export-format-source-code-or-example):
10727 the converted examples. 10730 Protect the converted examples.
10728 10731
10729 * org.el (org-set-regexps-and-options): Fix the regexp 10732 * org.el (org-set-regexps-and-options): Fix the regexp
10730 `org-complex-heading-regexp'. 10733 `org-complex-heading-regexp'.
@@ -10768,8 +10771,8 @@
10768 10771
10769 * org-macs.el (org-re): Handle the [:word:] class. 10772 * org-macs.el (org-re): Handle the [:word:] class.
10770 10773
10771 * org-exp.el (org-export-preprocess-string): Call 10774 * org-exp.el (org-export-preprocess-string):
10772 `org-export-protect-colon-examples'. 10775 Call `org-export-protect-colon-examples'.
10773 (org-export-protect-colon-examples): Rename from 10776 (org-export-protect-colon-examples): Rename from
10774 `org-export-protect-examples', and scope limited to lines starting 10777 `org-export-protect-examples', and scope limited to lines starting
10775 with a colon. 10778 with a colon.
@@ -10799,8 +10802,8 @@
10799 (org-export-latex-preprocess): Treat multiple references to a 10802 (org-export-latex-preprocess): Treat multiple references to a
10800 footnote. 10803 footnote.
10801 10804
10802 * org-exp.el (org-export-preprocess-string): Call 10805 * org-exp.el (org-export-preprocess-string):
10803 `org-footnote-normalize'. 10806 Call `org-footnote-normalize'.
10804 (org-export-as-ascii, org-export-as-html): Pass footnote variable 10807 (org-export-as-ascii, org-export-as-html): Pass footnote variable
10805 to preprocessor. 10808 to preprocessor.
10806 (org-export-as-html): Treat multiple references to a footnote. 10809 (org-export-as-html): Treat multiple references to a footnote.
@@ -10811,8 +10814,8 @@
10811 links. 10814 links.
10812 10815
10813 * org.el (org-bracket-link-analytic-regexp++): New variable. 10816 * org.el (org-bracket-link-analytic-regexp++): New variable.
10814 (org-make-link-regexps): Initialize 10817 (org-make-link-regexps):
10815 `org-bracket-link-analytic-regexp++'. 10818 Initialize `org-bracket-link-analytic-regexp++'.
10816 (org-store-link): Implement special case in edit-src buffer. 10819 (org-store-link): Implement special case in edit-src buffer.
10817 (org-insert-link): No use of ide to insert stored links. 10820 (org-insert-link): No use of ide to insert stored links.
10818 (org-link-search): Implement special case for coderefs. 10821 (org-link-search): Implement special case for coderefs.
@@ -10840,8 +10843,8 @@
10840 10843
108412009-01-16 Glenn Morris <rgm@gnu.org> 108442009-01-16 Glenn Morris <rgm@gnu.org>
10842 10845
10843 * org-mouse.el (org-mouse-show-context-menu): Use 10846 * org-mouse.el (org-mouse-show-context-menu):
10844 mouse-menu-major-mode-map, if defined, rather than the obsolete 10847 Use mouse-menu-major-mode-map, if defined, rather than the obsolete
10845 mouse-major-mode-menu. 10848 mouse-major-mode-menu.
10846 10849
108472008-12-23 Carsten Dominik <dominik@science.uva.nl> 108502008-12-23 Carsten Dominik <dominik@science.uva.nl>
@@ -10866,8 +10869,8 @@
10866 10869
108672008-12-20 Carsten Dominik <carsten.dominik@gmail.com> 108702008-12-20 Carsten Dominik <carsten.dominik@gmail.com>
10868 10871
10869 * org.el (org-get-refile-targets, org-refile-get-location): Use 10872 * org.el (org-get-refile-targets, org-refile-get-location):
10870 expanded file name to improve comparison. 10873 Use expanded file name to improve comparison.
10871 10874
108722008-12-20 Carsten Dominik <carsten.dominik@gmail.com> 108752008-12-20 Carsten Dominik <carsten.dominik@gmail.com>
10873 10876
@@ -10879,12 +10882,12 @@
10879 * org-export-latex.el (org-export-latex-links): Fix bug with 10882 * org-export-latex.el (org-export-latex-links): Fix bug with
10880 undefined label. 10883 undefined label.
10881 10884
10882 * org-table.el (org-table-get-specials): Set 10885 * org-table.el (org-table-get-specials):
10883 `org-table-current-last-data-line'. 10886 Set `org-table-current-last-data-line'.
10884 (org-table-current-last-data-line): New variable. 10887 (org-table-current-last-data-line): New variable.
10885 (org-table-insert-column, org-table-delete-column) 10888 (org-table-insert-column, org-table-delete-column)
10886 (org-table-move-column, org-table-fix-formulas): Call 10889 (org-table-move-column, org-table-fix-formulas):
10887 `org-table-fix-formulas' a second time to fix the $LR references. 10890 Call `org-table-fix-formulas' a second time to fix the $LR references.
10888 (org-table-get-specials): Add the $LR references to the tables. 10891 (org-table-get-specials): Add the $LR references to the tables.
10889 (org-table-get-formula): Do not offer last-row names as LHS of 10892 (org-table-get-formula): Do not offer last-row names as LHS of
10890 formulas. 10893 formulas.
@@ -10938,8 +10941,8 @@
10938 * org.el (org-refile): Avoid refiling to within the region to be 10941 * org.el (org-refile): Avoid refiling to within the region to be
10939 refiled. 10942 refiled.
10940 10943
10941 * org-export-latex.el (org-export-latex-special-chars): Replace 10944 * org-export-latex.el (org-export-latex-special-chars):
10942 special characters also in tables. 10945 Replace special characters also in tables.
10943 10946
10944 * org-agenda.el (org-agenda-change-all-lines): New argument 10947 * org-agenda.el (org-agenda-change-all-lines): New argument
10945 FORCE-TAGS. 10948 FORCE-TAGS.
@@ -10987,8 +10990,8 @@
10987 (org-export-as-latex): Pass RBEG to `org-export-latex-first-lines'. 10990 (org-export-as-latex): Pass RBEG to `org-export-latex-first-lines'.
10988 (org-export-latex-make-header): Add some hard space after the 10991 (org-export-latex-make-header): Add some hard space after the
10989 table of contents. 10992 table of contents.
10990 (org-export-latex-first-lines): Accept RBEG argument. Mark 10993 (org-export-latex-first-lines): Accept RBEG argument.
10991 exported text so that it will be excuded in further steps. 10994 Mark exported text so that it will be excuded in further steps.
10992 10995
10993 * org-table.el (org-table-get-specials): Make @0 reference the 10996 * org-table.el (org-table-get-specials): Make @0 reference the
10994 last line in a table. 10997 last line in a table.
@@ -11008,8 +11011,8 @@
11008 11011
11009 * org-exp.el (org-export-html-style-default): Add style 11012 * org-exp.el (org-export-html-style-default): Add style
11010 definitions for the figure div. 11013 definitions for the figure div.
11011 (org-export-preprocess-string, org-export-as-html): Implement 11014 (org-export-preprocess-string, org-export-as-html):
11012 attribute, label, and caption handling. 11015 Implement attribute, label, and caption handling.
11013 (org-export-attach-captions-and-attributes): New function. 11016 (org-export-attach-captions-and-attributes): New function.
11014 (org-export-html-format-image): New function. 11017 (org-export-html-format-image): New function.
11015 (org-format-org-table-html): Implement attribute, label, and 11018 (org-format-org-table-html): Implement attribute, label, and
@@ -11097,8 +11100,8 @@
11097 * org-w3m.el (w3m-minor-mode-hook): Also add the special copy 11100 * org-w3m.el (w3m-minor-mode-hook): Also add the special copy
11098 command to the `w3m-minor-mode-map'. 11101 command to the `w3m-minor-mode-map'.
11099 11102
11100 * org-archive.el (org-archive-to-archive-sibling): Protect 11103 * org-archive.el (org-archive-to-archive-sibling):
11101 `this-command' to avoid appending kills during archiving. 11104 Protect `this-command' to avoid appending kills during archiving.
11102 11105
11103 * org-exp.el (org-export-with-priority): New variable. 11106 * org-exp.el (org-export-with-priority): New variable.
11104 (org-export-add-options-to-plist): Use `org-export-plist-vars' 11107 (org-export-add-options-to-plist): Use `org-export-plist-vars'
@@ -11126,8 +11129,8 @@
111262008-12-07 Carsten Dominik <carsten.dominik@gmail.com> 111292008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
11127 11130
11128 * org.el (org-tags-exclude-from-inheritance): New option. 11131 * org.el (org-tags-exclude-from-inheritance): New option.
11129 (org-tag-inherit-p, org-remove-uniherited-tags): Respect 11132 (org-tag-inherit-p, org-remove-uniherited-tags):
11130 `org-tags-exclude-from-inheritance'. 11133 Respect `org-tags-exclude-from-inheritance'.
11131 11134
11132 * org-agenda.el (org-agenda-show-inherited-tags): New option. 11135 * org-agenda.el (org-agenda-show-inherited-tags): New option.
11133 (org-format-agenda-item): Add inherited tags to the agenda line 11136 (org-format-agenda-item): Add inherited tags to the agenda line
@@ -11185,8 +11188,8 @@
11185 accidentially overwritten by last commit to Emacs. 11188 accidentially overwritten by last commit to Emacs.
11186 11189
11187 * org.el (org-outline-path-complete-in-steps): New option. 11190 * org.el (org-outline-path-complete-in-steps): New option.
11188 (org-refile-get-location): Honor 11191 (org-refile-get-location):
11189 `org-outline-path-complete-in-steps'. 11192 Honor `org-outline-path-complete-in-steps'.
11190 (org-agenda-change-all-lines, org-tags-sparse-tree) 11193 (org-agenda-change-all-lines, org-tags-sparse-tree)
11191 (org-time-string-to-absolute, org-small-year-to-year) 11194 (org-time-string-to-absolute, org-small-year-to-year)
11192 (org-link-escape): Re-apply changes accidentially overwritten 11195 (org-link-escape): Re-apply changes accidentially overwritten
@@ -11209,8 +11212,8 @@
11209 line before the first headline to always be included. This is 11212 line before the first headline to always be included. This is
11210 to not miss a commented target. 11213 to not miss a commented target.
11211 11214
11212 * org-mouse.el (org-mouse-insert-item): Call 11215 * org-mouse.el (org-mouse-insert-item):
11213 `org-indent-to-column' instead of `indent-to', for XEmacs 11216 Call `org-indent-to-column' instead of `indent-to', for XEmacs
11214 compatibility. 11217 compatibility.
11215 11218
11216 * org.el (org-refile-targets): Fix customize definition so 11219 * org.el (org-refile-targets): Fix customize definition so
@@ -11233,18 +11236,18 @@
11233 11236
112342008-11-23 Carsten Dominik <carsten.dominik@gmail.com> 112372008-11-23 Carsten Dominik <carsten.dominik@gmail.com>
11235 11238
11236 * org-remember.el (org-remember-apply-template): Use 11239 * org-remember.el (org-remember-apply-template):
11237 `org-substring-no-properties'. 11240 Use `org-substring-no-properties'.
11238 11241
11239 * org-compat.el (org-substring-no-properties): New function. 11242 * org-compat.el (org-substring-no-properties): New function.
11240 11243
11241 * org-remember.el (org-remember-apply-template): Use 11244 * org-remember.el (org-remember-apply-template):
11242 `org-substring-no-properties' for compatibility. 11245 Use `org-substring-no-properties' for compatibility.
11243 11246
11244 * org-list.el (org-list-two-spaces-after-bullet-regexp): New 11247 * org-list.el (org-list-two-spaces-after-bullet-regexp):
11245 option. 11248 New option.
11246 (org-fix-bullet-type): Respect 11249 (org-fix-bullet-type):
11247 `org-list-two-spaces-after-bullet-regexp'. 11250 Respect `org-list-two-spaces-after-bullet-regexp'.
11248 11251
11249 * org-clock.el (org-clock-load): Clean up the code. 11252 * org-clock.el (org-clock-load): Clean up the code.
11250 11253
@@ -11309,8 +11312,8 @@
11309 (org-set-property, org-delete-property) 11312 (org-set-property, org-delete-property)
11310 (org-delete-property-globally): Use `org-ido-completing-read'. 11313 (org-delete-property-globally): Use `org-ido-completing-read'.
11311 11314
11312 * org-remember.el (org-remember-apply-template): Use 11315 * org-remember.el (org-remember-apply-template):
11313 `org-ido-completing-read'. 11316 Use `org-ido-completing-read'.
11314 11317
11315 * org-publish.el (org-publish): Use `org-ido-completing-read'. 11318 * org-publish.el (org-publish): Use `org-ido-completing-read'.
11316 11319
@@ -11318,14 +11321,14 @@
11318 (org-insert-columns-dblock): Use `org-ido-completing-read'. 11321 (org-insert-columns-dblock): Use `org-ido-completing-read'.
11319 11322
11320 * org-colview-xemacs.el (org-columns-edit-value) 11323 * org-colview-xemacs.el (org-columns-edit-value)
11321 (org-columns-new, org-insert-columns-dblock): Use 11324 (org-columns-new, org-insert-columns-dblock):
11322 `org-ido-completing-read'. 11325 Use `org-ido-completing-read'.
11323 11326
11324 * org-attach.el (org-attach-delete-one, org-attach-open): Use 11327 * org-attach.el (org-attach-delete-one, org-attach-open):
11325 `org-ido-completing-read'. 11328 Use `org-ido-completing-read'.
11326 11329
11327 * org-agenda.el (org-todo-list, org-agenda-filter-by-tag): Use 11330 * org-agenda.el (org-todo-list, org-agenda-filter-by-tag):
11328 `org-ido-completing-read'. 11331 Use `org-ido-completing-read'.
11329 11332
11330 * org.el (org-time-today): New function. 11333 * org.el (org-time-today): New function.
11331 (org-matcher-time): Use `org-time-today'. Add special treatment 11334 (org-matcher-time): Use `org-time-today'. Add special treatment
@@ -11340,8 +11343,8 @@
11340 11343
113412008-11-23 Carsten Dominik <carsten.dominik@gmail.com> 113442008-11-23 Carsten Dominik <carsten.dominik@gmail.com>
11342 11345
11343 * org-export-latex.el (org-export-latex-subcontent): Interprete 11346 * org-export-latex.el (org-export-latex-subcontent):
11344 target aliases as additonal labels. 11347 Interprete target aliases as additonal labels.
11345 11348
11346 * org-exp.el (org-export-target-aliases): New variable. 11349 * org-exp.el (org-export-target-aliases): New variable.
11347 (org-export-preprocess-string) 11350 (org-export-preprocess-string)
@@ -11388,8 +11391,8 @@
11388 11391
11389 * org-vm.el (org-vm-follow-link): Require `vm-search'. 11392 * org-vm.el (org-vm-follow-link): Require `vm-search'.
11390 11393
11391 * org.el (org-up-heading-safe, org-forward-same-level): Always 11394 * org.el (org-up-heading-safe, org-forward-same-level):
11392 call `org-back-to-heading' instead of `outline-back-to-heading'. 11395 Always call `org-back-to-heading' instead of `outline-back-to-heading'.
11393 (org-back-to-heading): New wrapper around outline-back-to-heading, 11396 (org-back-to-heading): New wrapper around outline-back-to-heading,
11394 with a useful error message telling where the error happened. 11397 with a useful error message telling where the error happened.
11395 11398
@@ -11495,8 +11498,8 @@
11495 11498
11496 * org.el (org-link-abbrev-alist): Improve customization type. 11499 * org.el (org-link-abbrev-alist): Improve customization type.
11497 11500
11498 * org-attach.el (org-attach-expand-link, org-attach-expand): New 11501 * org-attach.el (org-attach-expand-link, org-attach-expand):
11499 functions. 11502 New functions.
11500 11503
11501 * org-agenda.el (org-agenda-get-progress): Rename from 11504 * org-agenda.el (org-agenda-get-progress): Rename from
11502 `org-get-closed'. Implement searching for state changes as well. 11505 `org-get-closed'. Implement searching for state changes as well.
@@ -11535,8 +11538,8 @@
11535 * org-exp.el (org-export-as-html): Make sure that <hr/> is between 11538 * org-exp.el (org-export-as-html): Make sure that <hr/> is between
11536 paragraphs, not inside. 11539 paragraphs, not inside.
11537 11540
11538 * org.el (org-todo): Quote 11541 * org.el (org-todo):
11539 `org-agenda-headline-snapshot-before-repeat'. 11542 Quote `org-agenda-headline-snapshot-before-repeat'.
11540 11543
11541 * org-exp.el (org-export-as-html): Fully process link descriptions. 11544 * org-exp.el (org-export-as-html): Fully process link descriptions.
11542 (org-export-html-format-desc): New function. 11545 (org-export-html-format-desc): New function.
@@ -11551,14 +11554,14 @@
11551 really, a preliminary and incomplete version was present earlier, 11554 really, a preliminary and incomplete version was present earlier,
11552 but not used). 11555 but not used).
11553 11556
11554 * org.el (org-fast-todo-selection, org-fast-tag-selection): Use 11557 * org.el (org-fast-todo-selection, org-fast-tag-selection):
11555 `org-fit-window-to-buffer'. 11558 Use `org-fit-window-to-buffer'.
11556 11559
11557 * org-exp.el (org-export): Use `org-fit-window-to-buffer'. 11560 * org-exp.el (org-export): Use `org-fit-window-to-buffer'.
11558 11561
11559 * org-agenda.el (org-agenda-get-restriction-and-command) 11562 * org-agenda.el (org-agenda-get-restriction-and-command)
11560 (org-fit-agenda-window, org-agenda-convert-date): Use 11563 (org-fit-agenda-window, org-agenda-convert-date):
11561 `org-fit-window-to-buffer'. 11564 Use `org-fit-window-to-buffer'.
11562 11565
11563 * org-exp.el (org-export-as-html): Process href links through 11566 * org-exp.el (org-export-as-html): Process href links through
11564 `org-export-html-format-href'. 11567 `org-export-html-format-href'.
@@ -11581,8 +11584,8 @@
11581 (org-export-html-style-default): Mark style definitions as 11584 (org-export-html-style-default): Mark style definitions as
11582 unparsed CDATA. 11585 unparsed CDATA.
11583 11586
11584 * org-publish.el (org-publish-validate-link): Function 11587 * org-publish.el (org-publish-validate-link):
11585 re-introduced. 11588 Function re-introduced.
11586 11589
115872008-11-12 Charles Sebold <csebold@gmail.com> 115902008-11-12 Charles Sebold <csebold@gmail.com>
11588 11591
@@ -11727,8 +11730,8 @@
11727 11730
117282008-10-26 Bastien Guerry <bzg@altern.org> 117312008-10-26 Bastien Guerry <bzg@altern.org>
11729 11732
11730 * org-export-latex.el (org-export-latex-classes): Add 11733 * org-export-latex.el (org-export-latex-classes):
11731 \usepackage{graphicx} to the default list of packages. 11734 Add \usepackage{graphicx} to the default list of packages.
11732 11735
117332008-10-26 Carsten Dominik <dominik@science.uva.nl> 117362008-10-26 Carsten Dominik <dominik@science.uva.nl>
11734 11737
@@ -11742,8 +11745,8 @@
11742 (org-add-log-note): Mask prefix argument when immediately storing 11745 (org-add-log-note): Mask prefix argument when immediately storing
11743 the note. 11746 the note.
11744 11747
11745 * org-agenda.el (org-agenda-filter-effort-default-operator): New 11748 * org-agenda.el (org-agenda-filter-effort-default-operator):
11746 option. 11749 New option.
11747 11750
117482008-10-26 James TD Smith <ahktenzero@mohorovi.cc> 117512008-10-26 James TD Smith <ahktenzero@mohorovi.cc>
11749 11752
@@ -11776,8 +11779,8 @@
11776 11779
117772008-10-26 Carsten Dominik <dominik@science.uva.nl> 117802008-10-26 Carsten Dominik <dominik@science.uva.nl>
11778 11781
11779 * org.el (org-add-log-setup): Respect 11782 * org.el (org-add-log-setup):
11780 `org-log-state-notes-insert-after-drawers'. 11783 Respect `org-log-state-notes-insert-after-drawers'.
11781 (org-log-state-notes-insert-after-drawers): New option. 11784 (org-log-state-notes-insert-after-drawers): New option.
11782 (org-todo-trigger-tag-changes): New function. 11785 (org-todo-trigger-tag-changes): New function.
11783 (org-todo): Call `org-todo-trigger-tag-changes'. 11786 (org-todo): Call `org-todo-trigger-tag-changes'.
@@ -11812,8 +11815,8 @@
11812 11815
118132008-10-26 Carsten Dominik <dominik@science.uva.nl> 118162008-10-26 Carsten Dominik <dominik@science.uva.nl>
11814 11817
11815 * org-export-latex.el (org-export-latex-preprocess): Improve 11818 * org-export-latex.el (org-export-latex-preprocess):
11816 quoting of LaTeX environments. 11819 Improve quoting of LaTeX environments.
11817 11820
118182008-10-19 Eli Zaretskii <eliz@gnu.org> 118212008-10-19 Eli Zaretskii <eliz@gnu.org>
11819 11822
@@ -11868,8 +11871,8 @@
11868 11871
11869 * org-attach.el (org-attach-auto-tag): New option. 11872 * org-attach.el (org-attach-auto-tag): New option.
11870 (org-attach-tag, org-attach-untag): New functions. 11873 (org-attach-tag, org-attach-untag): New functions.
11871 (org-attach-attach, org-attach-new, org-attach-sync): Call 11874 (org-attach-attach, org-attach-new, org-attach-sync):
11872 `org-attach-tag'. 11875 Call `org-attach-tag'.
11873 (org-attach-delete): Call `org-attach-untag'. 11876 (org-attach-delete): Call `org-attach-untag'.
11874 11877
11875 * org-table.el (orgtbl-self-insert-command): Make this work for 11878 * org-table.el (orgtbl-self-insert-command): Make this work for
@@ -11896,8 +11899,8 @@
11896 * org-exp.el (org-infile-export-plist): Put the content of 11899 * org-exp.el (org-infile-export-plist): Put the content of
11897 #+LATEX_HEADER: into the property :latex-header-extra. 11900 #+LATEX_HEADER: into the property :latex-header-extra.
11898 11901
11899 * org-colview.el (org-columns-get-format-and-top-level): Remove 11902 * org-colview.el (org-columns-get-format-and-top-level):
11900 resetting the marker. 11903 Remove resetting the marker.
11901 11904
11902 * org-colview-xemacs.el (org-columns-get-format-and-top-level): 11905 * org-colview-xemacs.el (org-columns-get-format-and-top-level):
11903 Remove resetting the marker. 11906 Remove resetting the marker.
@@ -11909,8 +11912,8 @@
11909 * org-exp.el (org-infile-export-plist): Allow multiple STYLE lines. 11912 * org-exp.el (org-infile-export-plist): Allow multiple STYLE lines.
11910 11913
11911 * org.el (org-entry-get-multivalued-property) 11914 * org.el (org-entry-get-multivalued-property)
11912 (org-entry-protect-space, org-entry-restore-space): New 11915 (org-entry-protect-space, org-entry-restore-space):
11913 functions. 11916 New functions.
11914 (org-file-apps-defaults-macosx): Let postscript files be opened by 11917 (org-file-apps-defaults-macosx): Let postscript files be opened by
11915 preview. 11918 preview.
11916 (org-time-stamp-inactive): Call `org-time-stamp'. 11919 (org-time-stamp-inactive): Call `org-time-stamp'.
@@ -11945,8 +11948,8 @@
11945 * org-bbdb.el (org-bbdb-anniversaries): Require bbdb in 11948 * org-bbdb.el (org-bbdb-anniversaries): Require bbdb in
11946 `org-bbdb-anniversaries'. 11949 `org-bbdb-anniversaries'.
11947 11950
11948 * org.el (org-get-next-sibling, org-forward-same-level): New 11951 * org.el (org-get-next-sibling, org-forward-same-level):
11949 functions, similar to the outline versions, but invisible headings 11952 New functions, similar to the outline versions, but invisible headings
11950 are OK. 11953 are OK.
11951 11954
119522008-10-12 Bastien Guerry <bzg@altern.org> 119552008-10-12 Bastien Guerry <bzg@altern.org>
@@ -12071,15 +12074,15 @@
12071 (org-entries-lessp): Implement sorting by TODO state. 12074 (org-entries-lessp): Implement sorting by TODO state.
12072 (org-cmp-todo-state): New defsubst. 12075 (org-cmp-todo-state): New defsubst.
12073 12076
12074 * org-colview.el (org-colview-construct-allowed-dates): New 12077 * org-colview.el (org-colview-construct-allowed-dates):
12075 function. 12078 New function.
12076 (org-columns-next-allowed-value): Use 12079 (org-columns-next-allowed-value):
12077 `org-colview-construct-allowed-dates'. 12080 Use `org-colview-construct-allowed-dates'.
12078 12081
12079 * org-colview-xemacs.el (org-colview-construct-allowed-dates): New 12082 * org-colview-xemacs.el (org-colview-construct-allowed-dates):
12080 function. 12083 New function.
12081 (org-columns-next-allowed-value): Use 12084 (org-columns-next-allowed-value):
12082 `org-colview-construct-allowed-dates'. 12085 Use `org-colview-construct-allowed-dates'.
12083 12086
12084 * org.el (org-protect-slash): New function. 12087 * org.el (org-protect-slash): New function.
12085 (org-get-refile-targets): Use `org-protect-slash'. 12088 (org-get-refile-targets): Use `org-protect-slash'.
@@ -12087,8 +12090,8 @@
12087 * org-agenda.el (org-global-tags-completion-table): New variable. 12090 * org-agenda.el (org-global-tags-completion-table): New variable.
12088 12091
12089 * org-exp.el (org-export-handle-export-tags): New function. 12092 * org-exp.el (org-export-handle-export-tags): New function.
12090 (org-export-preprocess-string): Call 12093 (org-export-preprocess-string):
12091 `org-export-handle-export-tags'. 12094 Call `org-export-handle-export-tags'.
12092 12095
12093 * org-publish.el (org-publish-expand-components): Function removed. 12096 * org-publish.el (org-publish-expand-components): Function removed.
12094 (org-publish-expand-projects): Allow components to have components. 12097 (org-publish-expand-projects): Allow components to have components.
@@ -12098,8 +12101,8 @@
12098 (org-yank-and-fold-if-subtree): New function. 12101 (org-yank-and-fold-if-subtree): New function.
12099 12102
12100 * org-agenda.el (org-agenda-todayp): New function. 12103 * org-agenda.el (org-agenda-todayp): New function.
12101 (org-agenda-get-deadlines, org-agenda-get-scheduled): Use 12104 (org-agenda-get-deadlines, org-agenda-get-scheduled):
12102 `org-agenda-todayp'. 12105 Use `org-agenda-todayp'.
12103 12106
12104 * org.el (org-insert-heading-respect-content) 12107 * org.el (org-insert-heading-respect-content)
12105 (org-insert-todo-heading-respect-content): New commands. 12108 (org-insert-todo-heading-respect-content): New commands.
@@ -12207,11 +12210,11 @@
12207 * org-agenda.el (org-agenda-align-tags): Fix bug with malformed 12210 * org-agenda.el (org-agenda-align-tags): Fix bug with malformed
12208 face property. 12211 face property.
12209 12212
12210 * org-colview.el (org-columns-display-here): Use 12213 * org-colview.el (org-columns-display-here):
12211 `org-columns-modify-value-for-display-function'. 12214 Use `org-columns-modify-value-for-display-function'.
12212 12215
12213 * org-colview-xemacs.el (org-columns-display-here): Use 12216 * org-colview-xemacs.el (org-columns-display-here):
12214 `org-columns-modify-value-for-display-function'. 12217 Use `org-columns-modify-value-for-display-function'.
12215 12218
12216 * org.el (org-columns-modify-value-for-display-function): New option. 12219 * org.el (org-columns-modify-value-for-display-function): New option.
12217 12220
@@ -12268,14 +12271,14 @@
12268 12271
122692008-07-24 Carsten Dominik <dominik@science.uva.nl> 122722008-07-24 Carsten Dominik <dominik@science.uva.nl>
12270 12273
12271 * org-exp.el (org-export-region-as-html, org-export-as-html): Make 12274 * org-exp.el (org-export-region-as-html, org-export-as-html):
12272 sure that calls from `org-export-region-as-html' do not do the 12275 Make sure that calls from `org-export-region-as-html' do not do the
12273 special check for a subtree. 12276 special check for a subtree.
12274 12277
12275 * org-agenda.el (org-batch-store-agenda-views): Fix parsing bug. 12278 * org-agenda.el (org-batch-store-agenda-views): Fix parsing bug.
12276 12279
12277 * org.el (org-open-file): Use 12280 * org.el (org-open-file):
12278 `org-open-directory-means-index-dot-org'. 12281 Use `org-open-directory-means-index-dot-org'.
12279 (org-open-directory-means-index-dot-org): New option. 12282 (org-open-directory-means-index-dot-org): New option.
12280 12283
12281 * org.el (org-make-link-string): Remove link attributes from 12284 * org.el (org-make-link-string): Remove link attributes from
@@ -12291,8 +12294,8 @@
12291 * org.el (org-narrow-to-subtree): Do not include the final newline 12294 * org.el (org-narrow-to-subtree): Do not include the final newline
12292 into the narrowed region. 12295 into the narrowed region.
12293 12296
12294 * org-agenda.el (org-agenda-custom-commands-local-options): Fix 12297 * org-agenda.el (org-agenda-custom-commands-local-options):
12295 bug with user-define skipping condition. 12298 Fix bug with user-define skipping condition.
12296 12299
12297 * org-agenda.el (org-agenda-get-restriction-and-command): Fix typo. 12300 * org-agenda.el (org-agenda-get-restriction-and-command): Fix typo.
12298 12301
@@ -12311,8 +12314,8 @@
12311 * org-publish.el (org-publish-find-title): Bug fix. 12314 * org-publish.el (org-publish-find-title): Bug fix.
12312 (org-publish-org-index): Implement new :index-style option. 12315 (org-publish-org-index): Implement new :index-style option.
12313 12316
12314 * org-publish.el (org-publish-timestamp-filename): Use 12317 * org-publish.el (org-publish-timestamp-filename):
12315 SHA1-encoded file names in the timestamp directory. 12318 Use SHA1-encoded file names in the timestamp directory.
12316 12319
12317 * org-publish.el (org-publish-needed-p): Be verbose about files 12320 * org-publish.el (org-publish-needed-p): Be verbose about files
12318 published and files skipped. 12321 published and files skipped.
@@ -12454,8 +12457,8 @@
12454 `org-diary-to-ical-string' out of the loop, and kill the buffer 12457 `org-diary-to-ical-string' out of the loop, and kill the buffer
12455 afterwords. 12458 afterwords.
12456 12459
12457 * org-remember.el (org-remember-visit-immediately): Position 12460 * org-remember.el (org-remember-visit-immediately):
12458 cursor after moving to the note. 12461 Position cursor after moving to the note.
12459 (org-remember-apply-template): Use a text property to record the 12462 (org-remember-apply-template): Use a text property to record the
12460 cursor position. 12463 cursor position.
12461 (org-remember-handler): Align tags after pasting the note. 12464 (org-remember-handler): Align tags after pasting the note.
@@ -12498,8 +12501,8 @@
124982008-06-17 Carsten Dominik <dominik@science.uva.nl> 125012008-06-17 Carsten Dominik <dominik@science.uva.nl>
12499 12502
12500 * org-remember.el (org-jump-to-target-location): New variable. 12503 * org-remember.el (org-jump-to-target-location): New variable.
12501 (org-remember-apply-template): Set 12504 (org-remember-apply-template):
12502 `org-remember-apply-template' if requested by template. 12505 Set `org-remember-apply-template' if requested by template.
12503 (org-remember-handler): Start an idle timer to jump to 12506 (org-remember-handler): Start an idle timer to jump to
12504 remember location. 12507 remember location.
12505 12508
@@ -12549,8 +12552,8 @@
12549 12552
125502008-06-17 Carsten Dominik <dominik@science.uva.nl> 125532008-06-17 Carsten Dominik <dominik@science.uva.nl>
12551 12554
12552 * org-agenda.el (org-agenda-columns-remove-prefix-from-item): New 12555 * org-agenda.el (org-agenda-columns-remove-prefix-from-item):
12553 option. 12556 New option.
12554 12557
12555 * org-colview.el (org-agenda-columns-cleanup-item): New function. 12558 * org-colview.el (org-agenda-columns-cleanup-item): New function.
12556 12559
@@ -12671,11 +12674,11 @@
12671 * org-clock.el (org-clock-display, org-clock-out) 12674 * org-clock.el (org-clock-display, org-clock-out)
12672 (org-update-mode-line): Use `org-time-clocksum-format'. 12675 (org-update-mode-line): Use `org-time-clocksum-format'.
12673 12676
12674 * org-colview-xemacs.el (org-columns-number-to-string): Use 12677 * org-colview-xemacs.el (org-columns-number-to-string):
12675 `org-time-clocksum-format'. 12678 Use `org-time-clocksum-format'.
12676 12679
12677 * org-colview.el (org-columns-number-to-string): Use 12680 * org-colview.el (org-columns-number-to-string):
12678 `org-time-clocksum-format'. 12681 Use `org-time-clocksum-format'.
12679 12682
126802008-06-17 Carsten Dominik <dominik@science.uva.nl> 126832008-06-17 Carsten Dominik <dominik@science.uva.nl>
12681 12684
@@ -12703,8 +12706,8 @@
12703 (org-export-preprocess-string): Implement the COMMENT 12706 (org-export-preprocess-string): Implement the COMMENT
12704 environment. 12707 environment.
12705 12708
12706 * org-export-latex.el (org-export-latex-preprocess): Implement 12709 * org-export-latex.el (org-export-latex-preprocess):
12707 VERSE environment. 12710 Implement VERSE environment.
12708 12711
127092008-06-17 Carsten Dominik <dominik@science.uva.nl> 127122008-06-17 Carsten Dominik <dominik@science.uva.nl>
12710 12713
@@ -12759,8 +12762,8 @@
12759 12762
127602008-06-17 Carsten Dominik <dominik@science.uva.nl> 127632008-06-17 Carsten Dominik <dominik@science.uva.nl>
12761 12764
12762 * org.el (org-remove-double-quotes, org-file-contents): New 12765 * org.el (org-remove-double-quotes, org-file-contents):
12763 functions. 12766 New functions.
12764 12767
12765 * org-exp.el (org-infile-export-plist): Also parse the 12768 * org-exp.el (org-infile-export-plist): Also parse the
12766 contents of #+SETUPFILE files, recursively. 12769 contents of #+SETUPFILE files, recursively.
@@ -12769,8 +12772,8 @@
12769 contents of #+SETUPFILE files, recursively. 12772 contents of #+SETUPFILE files, recursively.
12770 12773
12771 * org-exp.el (org-export-handle-include-files): New function. 12774 * org-exp.el (org-export-handle-include-files): New function.
12772 (org-export-preprocess-string): Call 12775 (org-export-preprocess-string):
12773 `org-export-handle-include-files'. 12776 Call `org-export-handle-include-files'.
12774 12777
12775 * org.el (org-delete-property-globally) 12778 * org.el (org-delete-property-globally)
12776 (org-delete-property, org-set-property): Ignore case during 12779 (org-delete-property, org-set-property): Ignore case during
@@ -12798,8 +12801,8 @@
12798 * org.el (org-set-font-lock-defaults): Make the description 12801 * org.el (org-set-font-lock-defaults): Make the description
12799 tag bold. 12802 tag bold.
12800 12803
12801 * org-exp.el (org-export-as-html, org-close-li): Implement 12804 * org-exp.el (org-export-as-html, org-close-li):
12802 description lists. 12805 Implement description lists.
12803 12806
128042008-06-17 Jason Riedy <jason@acm.org> 128072008-06-17 Jason Riedy <jason@acm.org>
12805 12808
@@ -12880,7 +12883,7 @@
12880;; add-log-time-zone-rule: t 12883;; add-log-time-zone-rule: t
12881;; End: 12884;; End:
12882 12885
12883 Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. 12886 Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
12884 12887
12885 This file is part of GNU Emacs. 12888 This file is part of GNU Emacs.
12886 12889
diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el
index 5c7b0386e04..2ca98452141 100644
--- a/lisp/org/org-capture.el
+++ b/lisp/org/org-capture.el
@@ -1,6 +1,6 @@
1;;; org-capture.el --- Fast note taking in Org-mode 1;;; org-capture.el --- Fast note taking in Org-mode
2 2
3;; Copyright (C) 2010 Free Software Foundation, Inc. 3;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
4 4
5;; Author: Carsten Dominik <carsten at orgmode dot org> 5;; Author: Carsten Dominik <carsten at orgmode dot org>
6;; Keywords: outlines, hypermedia, calendar, wp 6;; Keywords: outlines, hypermedia, calendar, wp
@@ -359,8 +359,7 @@ for a Remember buffer.")
359 nil " Rem" org-capture-mode-map 359 nil " Rem" org-capture-mode-map
360 (org-set-local 360 (org-set-local
361 'header-line-format 361 'header-line-format
362 "Capture buffer. Finish `C-c C-c', refile `C-c C-w', abort `C-c C-k'.") 362 "Capture buffer. Finish `C-c C-c', refile `C-c C-w', abort `C-c C-k'."))
363 (run-hooks 'org-capture-mode-hook))
364(define-key org-capture-mode-map "\C-c\C-c" 'org-capture-finalize) 363(define-key org-capture-mode-map "\C-c\C-c" 'org-capture-finalize)
365(define-key org-capture-mode-map "\C-c\C-k" 'org-capture-kill) 364(define-key org-capture-mode-map "\C-c\C-k" 'org-capture-kill)
366(define-key org-capture-mode-map "\C-c\C-w" 'org-capture-refile) 365(define-key org-capture-mode-map "\C-c\C-w" 'org-capture-refile)
diff --git a/lisp/org/org-remember.el b/lisp/org/org-remember.el
index c6e21ae057b..20227d42d66 100644
--- a/lisp/org/org-remember.el
+++ b/lisp/org/org-remember.el
@@ -1,6 +1,6 @@
1;;; org-remember.el --- Fast note taking in Org-mode 1;;; org-remember.el --- Fast note taking in Org-mode
2 2
3;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 3;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
4;; Free Software Foundation, Inc. 4;; Free Software Foundation, Inc.
5 5
6;; Author: Carsten Dominik <carsten at orgmode dot org> 6;; Author: Carsten Dominik <carsten at orgmode dot org>
@@ -224,8 +224,7 @@ for a Remember buffer.")
224 224
225(define-minor-mode org-remember-mode 225(define-minor-mode org-remember-mode
226 "Minor mode for special key bindings in a remember buffer." 226 "Minor mode for special key bindings in a remember buffer."
227 nil " Rem" org-remember-mode-map 227 nil " Rem" org-remember-mode-map)
228 (run-hooks 'org-remember-mode-hook))
229(define-key org-remember-mode-map "\C-c\C-c" 'org-remember-finalize) 228(define-key org-remember-mode-map "\C-c\C-c" 'org-remember-finalize)
230(define-key org-remember-mode-map "\C-c\C-k" 'org-remember-kill) 229(define-key org-remember-mode-map "\C-c\C-k" 'org-remember-kill)
231 230
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 16450ee3b69..bcb22c35af4 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -72,7 +72,7 @@
72;; auto-mode-alist)) 72;; auto-mode-alist))
73;; 73;;
74;; where the path in the first line is the file system path to this file. 74;; where the path in the first line is the file system path to this file.
75;; MSDOS paths can be written like "d:/programs/emacs-19.34/site-lisp". 75;; MSDOS paths can be written like "d:/programs/emacs-19.34/site-lisp".
76;; Note: In XEmacs, either `/usr/lib/xemacs/site-lisp' (RPM default in 76;; Note: In XEmacs, either `/usr/lib/xemacs/site-lisp' (RPM default in
77;; Red Hat-based distributions) or `/usr/local/lib/xemacs/site-lisp' 77;; Red Hat-based distributions) or `/usr/local/lib/xemacs/site-lisp'
78;; (default when compiling from sources) are automatically added to 78;; (default when compiling from sources) are automatically added to
@@ -88,10 +88,10 @@
88;; 88;;
89;; % -*- Mode: Prolog -*- 89;; % -*- Mode: Prolog -*-
90;; 90;;
91;; and then the file will be open in Prolog mode no matter its 91;; and then the file will be open in Prolog mode no matter its
92;; extension, or 92;; extension, or
93;; 93;;
94;; o manually switch to prolog mode after opening a Prolog file, by typing 94;; o manually switch to prolog mode after opening a Prolog file, by typing
95;; M-x prolog-mode. 95;; M-x prolog-mode.
96;; 96;;
97;; If the command to start the prolog process ('sicstus', 'pl' or 97;; If the command to start the prolog process ('sicstus', 'pl' or
@@ -129,7 +129,7 @@
129;; Version 1.19: 129;; Version 1.19:
130;; o Minimal changes for Aquamacs inclusion and in general for 130;; o Minimal changes for Aquamacs inclusion and in general for
131;; better coping with finding the Prolog executable. Patch 131;; better coping with finding the Prolog executable. Patch
132;; provided by David Reitter 132;; provided by David Reitter
133;; Version 1.18: 133;; Version 1.18:
134;; o Fixed syntax highlighting for clause heads that do not begin at 134;; o Fixed syntax highlighting for clause heads that do not begin at
135;; the beginning of the line. 135;; the beginning of the line.
@@ -235,11 +235,11 @@
235;; o Fixed dots in the end of line comments causing indentation 235;; o Fixed dots in the end of line comments causing indentation
236;; problems. The following code is now correctly indented (note 236;; problems. The following code is now correctly indented (note
237;; the dot terminating the comment): 237;; the dot terminating the comment):
238;; a(X) :- b(X), 238;; a(X) :- b(X),
239;; c(X). % comment here. 239;; c(X). % comment here.
240;; a(X). 240;; a(X).
241;; and so is this (and variants): 241;; and so is this (and variants):
242;; a(X) :- b(X), 242;; a(X) :- b(X),
243;; c(X). /* comment here. */ 243;; c(X). /* comment here. */
244;; a(X). 244;; a(X).
245;; Version 1.0: 245;; Version 1.0:
@@ -262,15 +262,18 @@
262;; anyway. 262;; anyway.
263;; o Fixed prolog-pred-start, prolog-clause-start, prolog-clause-info. 263;; o Fixed prolog-pred-start, prolog-clause-start, prolog-clause-info.
264;; o Fix for prolog-build-case-strings; now prolog-upper-case-string 264;; o Fix for prolog-build-case-strings; now prolog-upper-case-string
265;; and prolog-lower-case-string are correctly initialized, 265;; and prolog-lower-case-string are correctly initialized,
266;; o Various font-lock changes; most importantly, block comments (/* 266;; o Various font-lock changes; most importantly, block comments (/*
267;; ... */) are now correctly fontified in XEmacs even when they 267;; ... */) are now correctly fontified in XEmacs even when they
268;; extend on multiple lines. 268;; extend on multiple lines.
269;; Version 0.1.36: 269;; Version 0.1.36:
270;; o The debug prompt of SWI Prolog is now correctly recognized. 270;; o The debug prompt of SWI Prolog is now correctly recognized.
271;; Version 0.1.35: 271;; Version 0.1.35:
272;; o Minor font-lock bug fixes. 272;; o Minor font-lock bug fixes.
273 273
274;;; TODO:
275
276;; Replace ":type 'sexp" with more precise Custom types.
274 277
275;;; Code: 278;;; Code:
276 279
@@ -361,7 +364,7 @@ The version numbers are of the format (Major . Minor)."
361(defcustom prolog-indent-width 4 364(defcustom prolog-indent-width 4
362 "*The indentation width used by the editing buffer." 365 "*The indentation width used by the editing buffer."
363 :group 'prolog-indentation 366 :group 'prolog-indentation
364 :type 'integer) 367 :type 'integer)
365 368
366(defcustom prolog-align-comments-flag t 369(defcustom prolog-align-comments-flag t
367 "*Non-nil means automatically align comments when indenting." 370 "*Non-nil means automatically align comments when indenting."
@@ -436,6 +439,7 @@ Legal values:
436 "ensure_loaded" "foreign" "include" "initialization" "multifile" "op" 439 "ensure_loaded" "foreign" "include" "initialization" "multifile" "op"
437 "public" "set_prolog_flag")) 440 "public" "set_prolog_flag"))
438 (t 441 (t
442 ;; FIXME: Shouldn't we just use the union of all the above here?
439 ("dynamic" "module"))) 443 ("dynamic" "module")))
440 "*Alist of Prolog keywords which is used for font locking of directives." 444 "*Alist of Prolog keywords which is used for font locking of directives."
441 :group 'prolog-font-lock 445 :group 'prolog-font-lock
@@ -494,15 +498,15 @@ If dot is pressed at the end of a line where at least one white space
494precedes the point, it inserts a recursive call to the current predicate. 498precedes the point, it inserts a recursive call to the current predicate.
495If dot is pressed at the beginning of an empty line, it inserts the head 499If dot is pressed at the beginning of an empty line, it inserts the head
496of a new clause for the current predicate. It does not apply in strings 500of a new clause for the current predicate. It does not apply in strings
497and comments. 501and comments.
498It does not apply in strings and comments." 502It does not apply in strings and comments."
499 :group 'prolog-keyboard 503 :group 'prolog-keyboard
500 :type 'boolean) 504 :type 'boolean)
501 505
502(defcustom prolog-electric-dot-full-predicate-template nil 506(defcustom prolog-electric-dot-full-predicate-template nil
503 "*If nil, electric dot inserts only the current predicate's name and `(' 507 "*If nil, electric dot inserts only the current predicate's name and `('
504for recursive calls or new clause heads. Non-nil means to also 508for recursive calls or new clause heads. Non-nil means to also
505insert enough commata to cover the predicate's arity and `)', 509insert enough commata to cover the predicate's arity and `)',
506and dot and newline for recursive calls." 510and dot and newline for recursive calls."
507 :group 'prolog-keyboard 511 :group 'prolog-keyboard
508 :type 'boolean) 512 :type 'boolean)
@@ -526,10 +530,10 @@ in ( If -> Then ; Else) and ( Disj1 ; Disj2 ) style expressions."
526to automatically indent if-then-else constructs." 530to automatically indent if-then-else constructs."
527 :group 'prolog-keyboard 531 :group 'prolog-keyboard
528 :type 'boolean) 532 :type 'boolean)
529 533
530(defcustom prolog-electric-colon-flag nil 534(defcustom prolog-electric-colon-flag nil
531 "*Makes `:' electric (inserts `:-' on a new line). 535 "*Makes `:' electric (inserts `:-' on a new line).
532If non-nil, pressing `:' at the end of a line that starts in 536If non-nil, pressing `:' at the end of a line that starts in
533the first column (i.e., clause heads) inserts ` :-' and newline." 537the first column (i.e., clause heads) inserts ` :-' and newline."
534 :group 'prolog-keyboard 538 :group 'prolog-keyboard
535 :type 'boolean) 539 :type 'boolean)
@@ -683,7 +687,8 @@ is non-nil for this variable."
683 687
684;; Miscellaneous 688;; Miscellaneous
685 689
686(defcustom prolog-use-prolog-tokenizer-flag t 690(defcustom prolog-use-prolog-tokenizer-flag
691 (not (fboundp 'syntax-propertize-rules))
687 "*Non-nil means use the internal prolog tokenizer for indentation etc. 692 "*Non-nil means use the internal prolog tokenizer for indentation etc.
688Otherwise use `parse-partial-sexp' which is faster but sometimes incorrect." 693Otherwise use `parse-partial-sexp' which is faster but sometimes incorrect."
689 :group 'prolog-other 694 :group 'prolog-other
@@ -717,9 +722,8 @@ Relevant only when `prolog-imenu-flag' is non-nil."
717 :type 'boolean) 722 :type 'boolean)
718 723
719(defcustom prolog-char-quote-workaround nil 724(defcustom prolog-char-quote-workaround nil
720 ;; FIXME: Use syntax-propertize-function to fix it right. 725 "*If non-nil, declare 0 as a quote character to handle 0'<char>.
721 "*If non-nil, declare 0 as a quote character so that 0'<char> does not break syntax highlighting. 726This is really kludgy, and unneeded (i.e. obsolete) in Emacs>=24."
722This is really kludgy but I have not found any better way of handling it."
723 :group 'prolog-other 727 :group 'prolog-other
724 :type 'boolean) 728 :type 'boolean)
725 729
@@ -731,6 +735,13 @@ This is really kludgy but I have not found any better way of handling it."
731;;(defvar prolog-temp-filename "") ; Later set by `prolog-temporary-file' 735;;(defvar prolog-temp-filename "") ; Later set by `prolog-temporary-file'
732 736
733(defvar prolog-mode-syntax-table 737(defvar prolog-mode-syntax-table
738 ;; The syntax accepted varies depending on the implementation used.
739 ;; Here are some of the differences:
740 ;; - SWI-Prolog accepts nested /*..*/ comments.
741 ;; - Edinburgh-style Prologs take <radix>'<number> for non-decimal number,
742 ;; whereas ISO-style Prologs use 0[obx]<number> instead.
743 ;; - In atoms \x<hex> sometimes needs a terminating \ (ISO-style)
744 ;; and sometimes not.
734 (let ((table (make-syntax-table))) 745 (let ((table (make-syntax-table)))
735 (if prolog-underscore-wordchar-flag 746 (if prolog-underscore-wordchar-flag
736 (modify-syntax-entry ?_ "w" table) 747 (modify-syntax-entry ?_ "w" table)
@@ -767,14 +778,14 @@ Set by prolog-build-case-strings.")
767(defvar prolog-lower-case-string "" 778(defvar prolog-lower-case-string ""
768 "A string containing all lower case characters. 779 "A string containing all lower case characters.
769Set by prolog-build-case-strings.") 780Set by prolog-build-case-strings.")
770 781
771(defvar prolog-atom-char-regexp "" 782(defvar prolog-atom-char-regexp ""
772 "Set by prolog-set-atom-regexps.") 783 "Set by prolog-set-atom-regexps.")
773;; "Regexp specifying characters which constitute atoms without quoting.") 784;; "Regexp specifying characters which constitute atoms without quoting.")
774(defvar prolog-atom-regexp "" 785(defvar prolog-atom-regexp ""
775 "Set by prolog-set-atom-regexps.") 786 "Set by prolog-set-atom-regexps.")
776 787
777(defconst prolog-left-paren "[[({]" 788(defconst prolog-left-paren "[[({]"
778 "The characters used as left parentheses for the indentation code.") 789 "The characters used as left parentheses for the indentation code.")
779(defconst prolog-right-paren "[])}]" 790(defconst prolog-right-paren "[])}]"
780 "The characters used as right parentheses for the indentation code.") 791 "The characters used as right parentheses for the indentation code.")
@@ -863,52 +874,58 @@ VERSION is of the format (Major . Minor)"
863 result) 874 result)
864 alist)) 875 alist))
865 876
877(defconst prolog-syntax-propertize-function
878 (when (fboundp 'syntax-propertize-rules)
879 (syntax-propertize-rules
880 ;; GNU Prolog only accepts 0'\' rather than 0'', but the only
881 ;; possible meaning of 0'' is rather clear.
882 ("\\<0\\(''?\\)"
883 (1 (unless (save-excursion (nth 8 (syntax-ppss (match-beginning 0))))
884 (string-to-syntax "_"))))
885 ;; We could check that we're not inside an atom, but I don't think
886 ;; that 'foo 8'z could be a valid syntax anyway, so why bother?
887 ("\\<[1-9][0-9]*\\('\\)[0-9a-zA-Z]" (1 "_"))
888 ;; Supposedly, ISO-Prolog wants \NNN\ for octal and \xNNN\ for hexadecimal
889 ;; escape sequences in atoms, so be careful not to let the terminating \
890 ;; escape a subsequent quote.
891 ("\\\\[x0-7][0-9a-fA-F]*\\(\\\\\\)" (1 "_"))
892 )))
893
866(defun prolog-mode-variables () 894(defun prolog-mode-variables ()
867 "Set some common variables to Prolog code specific values." 895 "Set some common variables to Prolog code specific values."
868 (setq local-abbrev-table prolog-mode-abbrev-table) 896 (setq local-abbrev-table prolog-mode-abbrev-table)
869 (make-local-variable 'paragraph-start) 897 (set (make-local-variable 'paragraph-start)
870 (setq paragraph-start (concat "[ \t]*$\\|" page-delimiter)) ;'%%..' 898 (concat "[ \t]*$\\|" page-delimiter)) ;'%%..'
871 (make-local-variable 'paragraph-separate) 899 (set (make-local-variable 'paragraph-separate) paragraph-start)
872 (setq paragraph-separate paragraph-start) 900 (set (make-local-variable 'paragraph-ignore-fill-prefix) t)
873 (make-local-variable 'paragraph-ignore-fill-prefix) 901 (set (make-local-variable 'normal-auto-fill-function) 'prolog-do-auto-fill)
874 (setq paragraph-ignore-fill-prefix t) 902 (set (make-local-variable 'indent-line-function) 'prolog-indent-line)
875 (make-local-variable 'normal-auto-fill-function) 903 (set (make-local-variable 'comment-start) "%")
876 (setq normal-auto-fill-function 'prolog-do-auto-fill) 904 (set (make-local-variable 'comment-end) "")
877 (make-local-variable 'indent-line-function) 905 (set (make-local-variable 'comment-add) 1)
878 (setq indent-line-function 'prolog-indent-line) 906 (set (make-local-variable 'comment-start-skip)
879 (make-local-variable 'comment-start) 907 ;; This complex regexp makes sure that comments cannot start
880 (setq comment-start "%") 908 ;; inside quoted atoms or strings
881 (make-local-variable 'comment-end) 909 (format "^\\(\\(%s\\|%s\\|[^\n\'\"%%]\\)*\\)\\(/\\*+ *\\|%%+ *\\)"
882 (setq comment-end "") 910 prolog-quoted-atom-regexp prolog-string-regexp))
883 (make-local-variable 'comment-start-skip) 911 (set (make-local-variable 'comment-indent-function) 'prolog-comment-indent)
884 ;; This complex regexp makes sure that comments cannot start 912 (set (make-local-variable 'parens-require-spaces) nil)
885 ;; inside quoted atoms or strings
886 (setq comment-start-skip
887 (format "^\\(\\(%s\\|%s\\|[^\n\'\"%%]\\)*\\)\\(/\\*+ *\\|%%+ *\\)"
888 prolog-quoted-atom-regexp prolog-string-regexp))
889 (make-local-variable 'comment-column)
890 (make-local-variable 'comment-indent-function)
891 (setq comment-indent-function 'prolog-comment-indent)
892 (make-local-variable 'parens-require-spaces)
893 (setq parens-require-spaces nil)
894 ;; Initialize Prolog system specific variables 913 ;; Initialize Prolog system specific variables
895 (let ((vars '(prolog-keywords prolog-types prolog-mode-specificators 914 (dolist (var '(prolog-keywords prolog-types prolog-mode-specificators
896 prolog-determinism-specificators prolog-directives 915 prolog-determinism-specificators prolog-directives
897 prolog-program-name prolog-program-switches 916 prolog-program-name prolog-program-switches
898 prolog-consult-string prolog-compile-string prolog-eof-string 917 prolog-consult-string prolog-compile-string prolog-eof-string
899 prolog-prompt-regexp prolog-continued-prompt-regexp 918 prolog-prompt-regexp prolog-continued-prompt-regexp
900 prolog-help-function))) 919 prolog-help-function))
901 (while vars 920 (set (intern (concat (symbol-name var) "-i"))
902 (set (intern (concat (symbol-name (car vars)) "-i")) 921 (prolog-find-value-by-system (symbol-value var))))
903 (prolog-find-value-by-system (symbol-value (car vars))))
904 (setq vars (cdr vars))))
905 (when (null prolog-program-name-i) 922 (when (null prolog-program-name-i)
906 (make-local-variable 'compile-command) 923 (set (make-local-variable 'compile-command) prolog-compile-string-i))
907 (setq compile-command prolog-compile-string-i)) 924 (set (make-local-variable 'font-lock-defaults)
908 (make-local-variable 'font-lock-defaults) 925 '(prolog-font-lock-keywords nil nil ((?_ . "w"))))
909 (setq font-lock-defaults 926 (set (make-local-variable 'syntax-propertize-function)
910 '(prolog-font-lock-keywords nil nil ((?_ . "w")))) 927 prolog-syntax-propertize-function)
911) 928 )
912 929
913(defun prolog-mode-keybindings-common (map) 930(defun prolog-mode-keybindings-common (map)
914 "Define keybindings common to both Prolog modes in MAP." 931 "Define keybindings common to both Prolog modes in MAP."
@@ -947,7 +964,7 @@ VERSION is of the format (Major . Minor)"
947 (define-key map ">" 'prolog-electric-if-then-else) 964 (define-key map ">" 'prolog-electric-if-then-else)
948 (define-key map ":" 'prolog-electric-colon) 965 (define-key map ":" 'prolog-electric-colon)
949 (define-key map "-" 'prolog-electric-dash) 966 (define-key map "-" 'prolog-electric-dash)
950 (if prolog-electric-newline-flag 967 (if prolog-electric-newline-flag
951 (define-key map "\r" 'newline-and-indent)) 968 (define-key map "\r" 'newline-and-indent))
952 969
953 ;; If we're running SICStus, then map C-c C-c e/d to enabling 970 ;; If we're running SICStus, then map C-c C-c e/d to enabling
@@ -975,7 +992,7 @@ VERSION is of the format (Major . Minor)"
975 (define-key map "\C-c\C-cr" 'prolog-compile-region) 992 (define-key map "\C-c\C-cr" 'prolog-compile-region)
976 (define-key map "\C-c\C-cb" 'prolog-compile-buffer) 993 (define-key map "\C-c\C-cb" 'prolog-compile-buffer)
977 (define-key map "\C-c\C-cf" 'prolog-compile-file)) 994 (define-key map "\C-c\C-cf" 'prolog-compile-file))
978 995
979 ;; Inherited from the old prolog.el. 996 ;; Inherited from the old prolog.el.
980 (define-key map "\e\C-x" 'prolog-consult-region) 997 (define-key map "\e\C-x" 'prolog-consult-region)
981 (define-key map "\C-c\C-l" 'prolog-consult-file) 998 (define-key map "\C-c\C-l" 'prolog-consult-file)
@@ -991,7 +1008,7 @@ VERSION is of the format (Major . Minor)"
991 (prolog-mode-keybindings-common map) 1008 (prolog-mode-keybindings-common map)
992 (prolog-mode-keybindings-edit map) 1009 (prolog-mode-keybindings-edit map)
993 map)) 1010 map))
994 1011
995 1012
996(defvar prolog-mode-hook nil 1013(defvar prolog-mode-hook nil
997 "List of functions to call after the prolog mode has initialised.") 1014 "List of functions to call after the prolog mode has initialised.")
@@ -1027,12 +1044,14 @@ if that value is non-nil."
1027 (dolist (ar prolog-align-rules) (add-to-list 'align-rules-list ar)) 1044 (dolist (ar prolog-align-rules) (add-to-list 'align-rules-list ar))
1028 1045
1029 ;; imenu entry moved to the appropriate hook for consistency 1046 ;; imenu entry moved to the appropriate hook for consistency
1030 1047
1031 ;; Load SICStus debugger if suitable 1048 ;; Load SICStus debugger if suitable
1032 (if (and (eq prolog-system 'sicstus) 1049 (if (and (eq prolog-system 'sicstus)
1033 (prolog-atleast-version '(3 . 7)) 1050 (prolog-atleast-version '(3 . 7))
1034 prolog-use-sicstus-sd) 1051 prolog-use-sicstus-sd)
1035 (prolog-enable-sicstus-sd))) 1052 (prolog-enable-sicstus-sd))
1053
1054 (prolog-menu))
1036 1055
1037(defvar mercury-mode-map 1056(defvar mercury-mode-map
1038 (let ((map (make-sparse-keymap))) 1057 (let ((map (make-sparse-keymap)))
@@ -1055,7 +1074,7 @@ Actually this is just customized `prolog-mode'."
1055 (prolog-mode-keybindings-common map) 1074 (prolog-mode-keybindings-common map)
1056 (prolog-mode-keybindings-inferior map) 1075 (prolog-mode-keybindings-inferior map)
1057 map)) 1076 map))
1058 1077
1059(defvar prolog-inferior-mode-hook nil 1078(defvar prolog-inferior-mode-hook nil
1060 "List of functions to call after the inferior prolog mode has initialised.") 1079 "List of functions to call after the inferior prolog mode has initialised.")
1061 1080
@@ -1092,7 +1111,8 @@ To find out what version of Prolog mode you are running, enter
1092 (setq mode-line-process '(": %s")) 1111 (setq mode-line-process '(": %s"))
1093 (prolog-mode-variables) 1112 (prolog-mode-variables)
1094 (setq comint-prompt-regexp prolog-prompt-regexp-i) 1113 (setq comint-prompt-regexp prolog-prompt-regexp-i)
1095 (set (make-local-variable 'shell-dirstack-query) "pwd.")) 1114 (set (make-local-variable 'shell-dirstack-query) "pwd.")
1115 (prolog-inferior-menu))
1096 1116
1097(defun prolog-input-filter (str) 1117(defun prolog-input-filter (str)
1098 (cond ((string-match "\\`\\s *\\'" str) nil) ;whitespace 1118 (cond ((string-match "\\`\\s *\\'" str) nil) ;whitespace
@@ -1169,8 +1189,8 @@ If COMPILEP is non-nil then use compilation, otherwise consulting."
1169 ;(let ((tmpfile prolog-temp-filename) 1189 ;(let ((tmpfile prolog-temp-filename)
1170 (let ((tmpfile (prolog-bsts (prolog-temporary-file))) 1190 (let ((tmpfile (prolog-bsts (prolog-temporary-file)))
1171 ;(process (get-process "prolog")) 1191 ;(process (get-process "prolog"))
1172 (first-line (1+ (count-lines 1192 (first-line (1+ (count-lines
1173 (point-min) 1193 (point-min)
1174 (save-excursion 1194 (save-excursion
1175 (goto-char start) 1195 (goto-char start)
1176 (point)))))) 1196 (point))))))
@@ -1199,7 +1219,7 @@ If COMPILEP is non-nil then use compilation, otherwise consulting."
1199 (prolog-ensure-process) 1219 (prolog-ensure-process)
1200 (let ((filename (prolog-bsts buffer-file-name))) 1220 (let ((filename (prolog-bsts buffer-file-name)))
1201 (process-send-string 1221 (process-send-string
1202 "prolog" (prolog-build-prolog-command 1222 "prolog" (prolog-build-prolog-command
1203 compilep filename filename)) 1223 compilep filename filename))
1204 (prolog-goto-prolog-process-buffer))) 1224 (prolog-goto-prolog-process-buffer)))
1205 1225
@@ -1274,11 +1294,11 @@ Bases decision on buffer contents (-*- line)."
1274 (save-excursion 1294 (save-excursion
1275 (goto-char (point-min)) 1295 (goto-char (point-min))
1276 (skip-chars-forward " \t") 1296 (skip-chars-forward " \t")
1277 (and (search-forward "-*-" (save-excursion (end-of-line) (point)) t) 1297 (and (search-forward "-*-" (line-end-position) t)
1278 (progn 1298 (progn
1279 (skip-chars-forward " \t") 1299 (skip-chars-forward " \t")
1280 (setq beg (point)) 1300 (setq beg (point))
1281 (search-forward "-*-" (save-excursion (end-of-line) (point)) t)) 1301 (search-forward "-*-" (line-end-position) t))
1282 (progn 1302 (progn
1283 (forward-char -3) 1303 (forward-char -3)
1284 (skip-chars-backward " \t") 1304 (skip-chars-backward " \t")
@@ -1295,7 +1315,7 @@ Bases decision on buffer contents (-*- line)."
1295 (skip-chars-backward " \t") 1315 (skip-chars-backward " \t")
1296 (buffer-substring beg (point))))))))) 1316 (buffer-substring beg (point)))))))))
1297 1317
1298(defun prolog-build-prolog-command (compilep file buffername 1318(defun prolog-build-prolog-command (compilep file buffername
1299 &optional first-line) 1319 &optional first-line)
1300 "Make Prolog command for FILE compilation/consulting. 1320 "Make Prolog command for FILE compilation/consulting.
1301If COMPILEP is non-nil, consider compilation, otherwise consulting." 1321If COMPILEP is non-nil, consider compilation, otherwise consulting."
@@ -1316,12 +1336,14 @@ If COMPILEP is non-nil, consider compilation, otherwise consulting."
1316 (if (not buffername) 1336 (if (not buffername)
1317 (error "The buffer is not saved")) 1337 (error "The buffer is not saved"))
1318 1338
1319 (if (not (string-match "^'.*'$" buffername)) ; Add quotes 1339 (if (not (string-match "\\`'.*'\\'" buffername)) ; Add quotes
1320 (setq buffername (concat "'" buffername "'"))) 1340 (setq buffername (concat "'" buffername "'")))
1321 (while (string-match "%m" compile-string) 1341 (while (string-match "%m" compile-string)
1322 (setq strbeg (substring compile-string 0 (match-beginning 0))) 1342 (setq strbeg (substring compile-string 0 (match-beginning 0)))
1323 (setq strend (substring compile-string (match-end 0))) 1343 (setq strend (substring compile-string (match-end 0)))
1324 (setq compile-string (concat strbeg module-file strend))) 1344 (setq compile-string (concat strbeg module-file strend)))
1345 ;; FIXME: The code below will %-expand any %[fbl] that appears in
1346 ;; module-file.
1325 (while (string-match "%f" compile-string) 1347 (while (string-match "%f" compile-string)
1326 (setq strbeg (substring compile-string 0 (match-beginning 0))) 1348 (setq strbeg (substring compile-string 0 (match-beginning 0)))
1327 (setq strend (substring compile-string (match-end 0))) 1349 (setq strend (substring compile-string (match-end 0)))
@@ -1340,7 +1362,7 @@ If COMPILEP is non-nil, consider compilation, otherwise consulting."
1340 1362
1341;; Global variables for process filter function 1363;; Global variables for process filter function
1342(defvar prolog-process-flag nil 1364(defvar prolog-process-flag nil
1343 "Non-nil means that a prolog task (i.e. a consultation or compilation job) 1365 "Non-nil means that a prolog task (i.e. a consultation or compilation job)
1344is running.") 1366is running.")
1345(defvar prolog-consult-compile-output "" 1367(defvar prolog-consult-compile-output ""
1346 "Hold the unprocessed output from the current prolog task.") 1368 "Hold the unprocessed output from the current prolog task.")
@@ -1366,7 +1388,7 @@ This function must be called from the source code buffer."
1366 (prolog-ensure-process t) 1388 (prolog-ensure-process t)
1367 (let* ((buffer (get-buffer-create prolog-compilation-buffer)) 1389 (let* ((buffer (get-buffer-create prolog-compilation-buffer))
1368 (real-file buffer-file-name) 1390 (real-file buffer-file-name)
1369 (command-string (prolog-build-prolog-command compilep file 1391 (command-string (prolog-build-prolog-command compilep file
1370 real-file first-line)) 1392 real-file first-line))
1371 (process (get-process "prolog")) 1393 (process (get-process "prolog"))
1372 (old-filter (process-filter process))) 1394 (old-filter (process-filter process)))
@@ -1374,14 +1396,12 @@ This function must be called from the source code buffer."
1374 (delete-region (point-min) (point-max)) 1396 (delete-region (point-min) (point-max))
1375 (compilation-mode) 1397 (compilation-mode)
1376 ;; Setting up font-locking for this buffer 1398 ;; Setting up font-locking for this buffer
1377 (make-local-variable 'font-lock-defaults) 1399 (set (make-local-variable 'font-lock-defaults)
1378 (setq font-lock-defaults 1400 '(prolog-font-lock-keywords nil nil ((?_ . "w"))))
1379 '(prolog-font-lock-keywords nil nil ((?_ . "w"))))
1380 (if (eq prolog-system 'sicstus) 1401 (if (eq prolog-system 'sicstus)
1381 (progn 1402 (progn
1382 (make-local-variable 'compilation-parse-errors-function) 1403 (set (make-local-variable 'compilation-parse-errors-function)
1383 (setq compilation-parse-errors-function 1404 'prolog-parse-sicstus-compilation-errors)))
1384 'prolog-parse-sicstus-compilation-errors)))
1385 (toggle-read-only 0) 1405 (toggle-read-only 0)
1386 (insert command-string "\n")) 1406 (insert command-string "\n"))
1387 (save-selected-window 1407 (save-selected-window
@@ -1390,7 +1410,7 @@ This function must be called from the source code buffer."
1390 prolog-consult-compile-output "" 1410 prolog-consult-compile-output ""
1391 prolog-consult-compile-first-line (if first-line (1- first-line) 0) 1411 prolog-consult-compile-first-line (if first-line (1- first-line) 0)
1392 prolog-consult-compile-file file 1412 prolog-consult-compile-file file
1393 prolog-consult-compile-real-file (if (string= 1413 prolog-consult-compile-real-file (if (string=
1394 file buffer-file-name) 1414 file buffer-file-name)
1395 nil 1415 nil
1396 real-file)) 1416 real-file))
@@ -1403,7 +1423,7 @@ This function must be called from the source code buffer."
1403 (accept-process-output process 10)) ; 10 secs is ok? 1423 (accept-process-output process 10)) ; 10 secs is ok?
1404 (sit-for 0.1) 1424 (sit-for 0.1)
1405 (unless (get-process "prolog") 1425 (unless (get-process "prolog")
1406 (setq prolog-process-flag nil))) 1426 (setq prolog-process-flag nil)))
1407 (insert (if compilep 1427 (insert (if compilep
1408 "\nCompilation finished.\n" 1428 "\nCompilation finished.\n"
1409 "\nConsulted.\n")) 1429 "\nConsulted.\n"))
@@ -1416,7 +1436,7 @@ For use with the `compilation-parse-errors-function' variable."
1416 (setq compilation-error-list nil) 1436 (setq compilation-error-list nil)
1417 (message "Parsing SICStus error messages...") 1437 (message "Parsing SICStus error messages...")
1418 (let (filepath dir file errorline) 1438 (let (filepath dir file errorline)
1419 (while 1439 (while
1420 (re-search-backward 1440 (re-search-backward
1421 "{\\([a-zA-Z ]* ERROR\\|Warning\\):.* in line[s ]*\\([0-9]+\\)" 1441 "{\\([a-zA-Z ]* ERROR\\|Warning\\):.* in line[s ]*\\([0-9]+\\)"
1422 limit t) 1442 limit t)
@@ -1455,15 +1475,15 @@ Argument OUTPUT is a name of the output file."
1455 (while (and prolog-process-flag 1475 (while (and prolog-process-flag
1456 (or 1476 (or
1457 ;; Trace question 1477 ;; Trace question
1458 (progn 1478 (progn
1459 (setq outputtype 'trace) 1479 (setq outputtype 'trace)
1460 (and (eq prolog-system 'sicstus) 1480 (and (eq prolog-system 'sicstus)
1461 (string-match 1481 (string-match
1462 "^[ \t]*[0-9]+[ \t]*[0-9]+[ \t]*Call:.*? " 1482 "^[ \t]*[0-9]+[ \t]*[0-9]+[ \t]*Call:.*? "
1463 prolog-consult-compile-output))) 1483 prolog-consult-compile-output)))
1464 1484
1465 ;; Match anything 1485 ;; Match anything
1466 (progn 1486 (progn
1467 (setq outputtype 'normal) 1487 (setq outputtype 'normal)
1468 (string-match "^.*\n" prolog-consult-compile-output)) 1488 (string-match "^.*\n" prolog-consult-compile-output))
1469 )) 1489 ))
@@ -1474,17 +1494,16 @@ Argument OUTPUT is a name of the output file."
1474 (setq prolog-consult-compile-output 1494 (setq prolog-consult-compile-output
1475 (substring prolog-consult-compile-output (length output))) 1495 (substring prolog-consult-compile-output (length output)))
1476 ;;(message "pccf2: %s" prolog-consult-compile-output) 1496 ;;(message "pccf2: %s" prolog-consult-compile-output)
1477 1497
1478 ;; If temporary files were used, then we change the error 1498 ;; If temporary files were used, then we change the error
1479 ;; messages to point to the original source file. 1499 ;; messages to point to the original source file.
1480 (cond 1500 (cond
1481 1501
1482 ;; If the prolog process was in trace mode then it requires 1502 ;; If the prolog process was in trace mode then it requires
1483 ;; user input 1503 ;; user input
1484 ((and (eq prolog-system 'sicstus) 1504 ((and (eq prolog-system 'sicstus)
1485 (eq outputtype 'trace)) 1505 (eq outputtype 'trace))
1486 (let (input) 1506 (let ((input (concat (read-string output) "\n")))
1487 (setq input (concat (read-string output) "\n"))
1488 (process-send-string process input) 1507 (process-send-string process input)
1489 (setq output (concat output input)))) 1508 (setq output (concat output input))))
1490 1509
@@ -1493,7 +1512,7 @@ Argument OUTPUT is a name of the output file."
1493 (string-match 1512 (string-match
1494 "\\({.*:.* in line[s ]*\\)\\([0-9]+\\)-\\([0-9]+\\)" output)) 1513 "\\({.*:.* in line[s ]*\\)\\([0-9]+\\)-\\([0-9]+\\)" output))
1495 (setq output (replace-match 1514 (setq output (replace-match
1496 ;; Adds a {processing ...} line so that 1515 ;; Adds a {processing ...} line so that
1497 ;; `prolog-parse-sicstus-compilation-errors' 1516 ;; `prolog-parse-sicstus-compilation-errors'
1498 ;; finds the real file instead of the temporary one. 1517 ;; finds the real file instead of the temporary one.
1499 ;; Also fixes the line numbers. 1518 ;; Also fixes the line numbers.
@@ -1508,7 +1527,7 @@ Argument OUTPUT is a name of the output file."
1508 (match-string 3 output)))) 1527 (match-string 3 output))))
1509 t t output))) 1528 t t output)))
1510 ) 1529 )
1511 1530
1512 ((eq prolog-system 'swi) 1531 ((eq prolog-system 'swi)
1513 (if (and prolog-consult-compile-real-file 1532 (if (and prolog-consult-compile-real-file
1514 (string-match (format 1533 (string-match (format
@@ -1525,7 +1544,7 @@ Argument OUTPUT is a name of the output file."
1525 (match-string 2 output)))) 1544 (match-string 2 output))))
1526 t t output))) 1545 t t output)))
1527 ) 1546 )
1528 1547
1529 (t ()) 1548 (t ())
1530 ) 1549 )
1531 ;; Write the output in the *prolog-compilation* buffer 1550 ;; Write the output in the *prolog-compilation* buffer
@@ -1593,14 +1612,14 @@ If PROTECT is non-nil, surround the result regexp by word breaks."
1593 "Find SICStus objects method name for font lock. 1612 "Find SICStus objects method name for font lock.
1594Argument BOUND is a buffer position limiting searching." 1613Argument BOUND is a buffer position limiting searching."
1595 (let (point 1614 (let (point
1596 (case-fold-search nil)) 1615 (case-fold-search nil))
1597 (while (and (not point) 1616 (while (and (not point)
1598 (re-search-forward "\\(::[ \t\n]*{\\|&\\)[ \t]*" 1617 (re-search-forward "\\(::[ \t\n]*{\\|&\\)[ \t]*"
1599 bound t)) 1618 bound t))
1600 (while (or (re-search-forward "\\=\n[ \t]*" bound t) 1619 (while (or (re-search-forward "\\=\n[ \t]*" bound t)
1601 (re-search-forward "\\=%.*" bound t) 1620 (re-search-forward "\\=%.*" bound t)
1602 (and (re-search-forward "\\=/\\*" bound t) 1621 (and (re-search-forward "\\=/\\*" bound t)
1603 (re-search-forward "\\*/[ \t]*" bound t)))) 1622 (re-search-forward "\\*/[ \t]*" bound t))))
1604 (setq point (re-search-forward 1623 (setq point (re-search-forward
1605 (format "\\=\\(%s\\)" prolog-atom-regexp) 1624 (format "\\=\\(%s\\)" prolog-atom-regexp)
1606 bound t))) 1625 bound t)))
@@ -1620,7 +1639,7 @@ Argument BOUND is a buffer position limiting searching."
1620 "Set up font lock keywords for the current Prolog system." 1639 "Set up font lock keywords for the current Prolog system."
1621 ;(when window-system 1640 ;(when window-system
1622 (require 'font-lock) 1641 (require 'font-lock)
1623 1642
1624 ;; Define Prolog faces 1643 ;; Define Prolog faces
1625 (defface prolog-redo-face 1644 (defface prolog-redo-face
1626 '((((class grayscale)) (:italic t)) 1645 '((((class grayscale)) (:italic t))
@@ -1656,12 +1675,12 @@ Argument BOUND is a buffer position limiting searching."
1656 (t (:bold t))) 1675 (t (:bold t)))
1657 "Face name to use for compiler warnings." 1676 "Face name to use for compiler warnings."
1658 :group 'prolog-faces) 1677 :group 'prolog-faces)
1659 (defvar prolog-warning-face 1678 (defvar prolog-warning-face
1660 (if (prolog-face-name-p 'font-lock-warning-face) 1679 (if (prolog-face-name-p 'font-lock-warning-face)
1661 'font-lock-warning-face 1680 'font-lock-warning-face
1662 'prolog-warning-face) 1681 'prolog-warning-face)
1663 "Face name to use for built in predicates.") 1682 "Face name to use for built in predicates.")
1664 (defvar prolog-builtin-face 1683 (defvar prolog-builtin-face
1665 (if (prolog-face-name-p 'font-lock-builtin-face) 1684 (if (prolog-face-name-p 'font-lock-builtin-face)
1666 'font-lock-builtin-face 1685 'font-lock-builtin-face
1667 'prolog-builtin-face) 1686 'prolog-builtin-face)
@@ -1672,7 +1691,7 @@ Argument BOUND is a buffer position limiting searching."
1672 "Face name to use for exit trace lines.") 1691 "Face name to use for exit trace lines.")
1673 (defvar prolog-exception-face 'prolog-exception-face 1692 (defvar prolog-exception-face 'prolog-exception-face
1674 "Face name to use for exception trace lines.") 1693 "Face name to use for exception trace lines.")
1675 1694
1676 ;; Font Lock Patterns 1695 ;; Font Lock Patterns
1677 (let ( 1696 (let (
1678 ;; "Native" Prolog patterns 1697 ;; "Native" Prolog patterns
@@ -1808,7 +1827,7 @@ Argument BOUND is a buffer position limiting searching."
1808 (warning-messages 1827 (warning-messages
1809 (cond 1828 (cond
1810 ((eq prolog-system 'sicstus) 1829 ((eq prolog-system 'sicstus)
1811 '("\\({ ?\\(Warning\\|WARNING\\) ?:.*}\\)[ \t]*$" 1830 '("\\({ ?\\(Warning\\|WARNING\\) ?:.*}\\)[ \t]*$"
1812 2 prolog-warning-face prepend)) 1831 2 prolog-warning-face prepend))
1813 (t nil)))) 1832 (t nil))))
1814 1833
@@ -1870,15 +1889,25 @@ rigidly along with this one (not yet)."
1870 (beginning-of-line) 1889 (beginning-of-line)
1871 (setq beg (point)) 1890 (setq beg (point))
1872 (skip-chars-forward " \t") 1891 (skip-chars-forward " \t")
1873 (if (zerop (- indent (current-column))) 1892 (indent-line-to indent)
1874 nil
1875 (delete-region beg (point))
1876 (indent-to indent))
1877 (if (> (- (point-max) pos) (point)) 1893 (if (> (- (point-max) pos) (point))
1878 (goto-char (- (point-max) pos))) 1894 (goto-char (- (point-max) pos)))
1879 1895
1880 ;; Align comments 1896 ;; Align comments
1881 (if prolog-align-comments-flag 1897 (if (and prolog-align-comments-flag
1898 (save-excursion
1899 (line-beginning-position)
1900 ;; (let ((start (comment-search-forward (line-end-position) t)))
1901 ;; (and start ;There's a comment to indent.
1902 ;; ;; If it's first on the line, we've indented it already
1903 ;; ;; and prolog-goto-comment-column would inf-loop.
1904 ;; (progn (goto-char start) (skip-chars-backward " \t")
1905 ;; (not (bolp)))))))
1906 (and (looking-at comment-start-skip)
1907 ;; The definition of comment-start-skip used in this
1908 ;; mode is unusual in that it only matches at BOL.
1909 (progn (skip-chars-forward " \t")
1910 (not (eq (point) (match-end 1)))))))
1882 (save-excursion 1911 (save-excursion
1883 (prolog-goto-comment-column t))) 1912 (prolog-goto-comment-column t)))
1884 1913
@@ -1889,6 +1918,8 @@ rigidly along with this one (not yet)."
1889 1918
1890(defun prolog-comment-indent () 1919(defun prolog-comment-indent ()
1891 "Compute prolog comment indentation." 1920 "Compute prolog comment indentation."
1921 ;; FIXME: Only difference with default behavior is that %%% is not
1922 ;; flushed to column 0 but just left where the user put it.
1892 (cond ((looking-at "%%%") (prolog-indentation-level-of-line)) 1923 (cond ((looking-at "%%%") (prolog-indentation-level-of-line))
1893 ((looking-at "%%") (prolog-indent-level)) 1924 ((looking-at "%%") (prolog-indent-level))
1894 (t 1925 (t
@@ -1909,13 +1940,13 @@ rigidly along with this one (not yet)."
1909 (skip-chars-forward " \t") 1940 (skip-chars-forward " \t")
1910 (cond 1941 (cond
1911 ((looking-at "%%%") (prolog-indentation-level-of-line)) 1942 ((looking-at "%%%") (prolog-indentation-level-of-line))
1912 ;Large comment starts 1943 ;Large comment starts
1913 ((looking-at "%[^%]") comment-column) ;Small comment starts 1944 ((looking-at "%[^%]") comment-column) ;Small comment starts
1914 ((bobp) 0) ;Beginning of buffer 1945 ((bobp) 0) ;Beginning of buffer
1915 1946
1916 ;; If we found '}' then we must check if it's the 1947 ;; If we found '}' then we must check if it's the
1917 ;; end of an object declaration or something else. 1948 ;; end of an object declaration or something else.
1918 ((and (looking-at "}") 1949 ((and (looking-at "}")
1919 (save-excursion 1950 (save-excursion
1920 (forward-char 1) 1951 (forward-char 1)
1921 ;; Goto to matching { 1952 ;; Goto to matching {
@@ -1928,10 +1959,10 @@ rigidly along with this one (not yet)."
1928 ;; It was an object 1959 ;; It was an object
1929 (if prolog-object-end-to-0-flag 1960 (if prolog-object-end-to-0-flag
1930 0 1961 0
1931 prolog-indent-width)) 1962 prolog-indent-width))
1932 1963
1933 ;;End of /* */ comment 1964 ;;End of /* */ comment
1934 ((looking-at "\\*/") 1965 ((looking-at "\\*/")
1935 (save-excursion 1966 (save-excursion
1936 (prolog-find-start-of-mline-comment) 1967 (prolog-find-start-of-mline-comment)
1937 (skip-chars-backward " \t") 1968 (skip-chars-backward " \t")
@@ -1939,7 +1970,7 @@ rigidly along with this one (not yet)."
1939 1970
1940 ;; Here we check if the current line is within a /* */ pair 1971 ;; Here we check if the current line is within a /* */ pair
1941 ((and (looking-at "[^%/]") 1972 ((and (looking-at "[^%/]")
1942 (eq (prolog-in-string-or-comment) 'cmt)) 1973 (eq (prolog-in-string-or-comment) 'cmt))
1943 (if prolog-indent-mline-comments-flag 1974 (if prolog-indent-mline-comments-flag
1944 (prolog-find-start-of-mline-comment) 1975 (prolog-find-start-of-mline-comment)
1945 ;; Same as before 1976 ;; Same as before
@@ -1951,18 +1982,19 @@ rigidly along with this one (not yet)."
1951 (while empty 1982 (while empty
1952 (forward-line -1) 1983 (forward-line -1)
1953 (beginning-of-line) 1984 (beginning-of-line)
1954 (if (= (point) (point-min)) 1985 (if (bobp)
1955 (setq empty nil) 1986 (setq empty nil)
1956 (skip-chars-forward " \t") 1987 (skip-chars-forward " \t")
1957 (if (not (or (not (member (prolog-in-string-or-comment) '(nil txt))) 1988 (if (not (or (not (member (prolog-in-string-or-comment)
1958 (looking-at "%") 1989 '(nil txt)))
1990 (looking-at "%")
1959 (looking-at "\n"))) 1991 (looking-at "\n")))
1960 (setq empty nil)))) 1992 (setq empty nil))))
1961 1993
1962 ;; Store this line's indentation 1994 ;; Store this line's indentation
1963 (if (= (point) (point-min)) 1995 (setq ind (if (bobp)
1964 (setq ind 0) ;Beginning of buffer 1996 0 ;Beginning of buffer.
1965 (setq ind (current-column))) ;Beginning of clause 1997 (current-column))) ;Beginning of clause.
1966 1998
1967 ;; Compute the balance of the line 1999 ;; Compute the balance of the line
1968 (setq linebal (prolog-paren-balance)) 2000 (setq linebal (prolog-paren-balance))
@@ -1981,25 +2013,25 @@ rigidly along with this one (not yet)."
1981 (cond 2013 (cond
1982 ;; If the last char of the line is a '&' then set the indent level 2014 ;; If the last char of the line is a '&' then set the indent level
1983 ;; to prolog-indent-width (used in SICStus objects) 2015 ;; to prolog-indent-width (used in SICStus objects)
1984 ((and (eq prolog-system 'sicstus) 2016 ((and (eq prolog-system 'sicstus)
1985 (looking-at ".+&[ \t]*\\(%.*\\|\\)$")) 2017 (looking-at ".+&[ \t]*\\(%.*\\|\\)$"))
1986 (setq ind prolog-indent-width)) 2018 (setq ind prolog-indent-width))
1987 2019
1988 ;; Increase indentation if the previous line was the head of a rule 2020 ;; Increase indentation if the previous line was the head of a rule
1989 ;; and does not contain a '.' 2021 ;; and does not contain a '.'
1990 ((and (looking-at (format ".*%s[^\\.]*[ \t]*\\(%%.*\\|\\)$" 2022 ((and (looking-at (format ".*%s[^\\.]*[ \t]*\\(%%.*\\|\\)$"
1991 prolog-head-delimiter)) 2023 prolog-head-delimiter))
1992 ;; We must check that the match is at a paren balance of 0. 2024 ;; We must check that the match is at a paren balance of 0.
1993 (save-excursion 2025 (save-excursion
1994 (let ((p (point))) 2026 (let ((p (point)))
1995 (re-search-forward prolog-head-delimiter) 2027 (re-search-forward prolog-head-delimiter)
1996 (>= 0 (prolog-region-paren-balance p (point)))))) 2028 (>= 0 (prolog-region-paren-balance p (point))))))
1997 (let (headindent) 2029 (let ((headindent
1998 (if (< (prolog-paren-balance) 0) 2030 (if (< (prolog-paren-balance) 0)
1999 (save-excursion 2031 (save-excursion
2000 (end-of-line) 2032 (end-of-line)
2001 (setq headindent (prolog-find-indent-of-matching-paren))) 2033 (prolog-find-indent-of-matching-paren))
2002 (setq headindent (prolog-indentation-level-of-line))) 2034 (prolog-indentation-level-of-line))))
2003 (setq ind (+ headindent prolog-indent-width)))) 2035 (setq ind (+ headindent prolog-indent-width))))
2004 2036
2005 ;; The previous line was the head of an object 2037 ;; The previous line was the head of an object
@@ -2009,17 +2041,16 @@ rigidly along with this one (not yet)."
2009 ;; If a '.' is found at the end of the previous line, then 2041 ;; If a '.' is found at the end of the previous line, then
2010 ;; decrease the indentation. (The \\(%.*\\|\\) part of the 2042 ;; decrease the indentation. (The \\(%.*\\|\\) part of the
2011 ;; regexp is for comments at the end of the line) 2043 ;; regexp is for comments at the end of the line)
2012 ((and (looking-at "^.+\\.[ \t]*\\(%.*\\|\\)$") 2044 ((and (looking-at "^.+\\.[ \t]*\\(%.*\\|\\)$")
2013 ;; Make sure that the '.' found is not in a comment or string 2045 ;; Make sure that the '.' found is not in a comment or string
2014 (save-excursion 2046 (save-excursion
2015 (end-of-line) 2047 (end-of-line)
2016 (re-search-backward "\\.[ \t]*\\(%.*\\|\\)$" (point-min)) 2048 (re-search-backward "\\.[ \t]*\\(%.*\\|\\)$" (point-min))
2017 ;; Guard against the real '.' being followed by a 2049 ;; Guard against the real '.' being followed by a
2018 ;; commented '.'. 2050 ;; commented '.'.
2019 (if (eq (prolog-in-string-or-comment) 'cmt) ;; commented out '.' 2051 (if (eq (prolog-in-string-or-comment) 'cmt)
2020 (let ((here (save-excursion 2052 ;; commented out '.'
2021 (beginning-of-line) 2053 (let ((here (line-beginning-position)))
2022 (point))))
2023 (end-of-line) 2054 (end-of-line)
2024 (re-search-backward "\\.[ \t]*%.*$" here t)) 2055 (re-search-backward "\\.[ \t]*%.*$" here t))
2025 (not (prolog-in-string-or-comment)) 2056 (not (prolog-in-string-or-comment))
@@ -2031,17 +2062,16 @@ rigidly along with this one (not yet)."
2031 ;; decrease the indentation. (The /\\*.*\\*/ part of the 2062 ;; decrease the indentation. (The /\\*.*\\*/ part of the
2032 ;; regexp is for C-like comments at the end of the 2063 ;; regexp is for C-like comments at the end of the
2033 ;; line--can we merge with the case above?). 2064 ;; line--can we merge with the case above?).
2034 ((and (looking-at "^.+\\.[ \t]*\\(/\\*.*\\|\\)$") 2065 ((and (looking-at "^.+\\.[ \t]*\\(/\\*.*\\|\\)$")
2035 ;; Make sure that the '.' found is not in a comment or string 2066 ;; Make sure that the '.' found is not in a comment or string
2036 (save-excursion 2067 (save-excursion
2037 (end-of-line) 2068 (end-of-line)
2038 (re-search-backward "\\.[ \t]*\\(/\\*.*\\|\\)$" (point-min)) 2069 (re-search-backward "\\.[ \t]*\\(/\\*.*\\|\\)$" (point-min))
2039 ;; Guard against the real '.' being followed by a 2070 ;; Guard against the real '.' being followed by a
2040 ;; commented '.'. 2071 ;; commented '.'.
2041 (if (eq (prolog-in-string-or-comment) 'cmt) ;; commented out '.' 2072 (if (eq (prolog-in-string-or-comment) 'cmt)
2042 (let ((here (save-excursion 2073 ;; commented out '.'
2043 (beginning-of-line) 2074 (let ((here (line-beginning-position)))
2044 (point))))
2045 (end-of-line) 2075 (end-of-line)
2046 (re-search-backward "\\.[ \t]*/\\*.*$" here t)) 2076 (re-search-backward "\\.[ \t]*/\\*.*$" here t))
2047 (not (prolog-in-string-or-comment)) 2077 (not (prolog-in-string-or-comment))
@@ -2062,20 +2092,21 @@ rigidly along with this one (not yet)."
2062 (= totbal 1) 2092 (= totbal 1)
2063 (prolog-in-object)))) 2093 (prolog-in-object))))
2064 (if (looking-at 2094 (if (looking-at
2065 (format "\\(%s\\|%s\\|0'.\\|[0-9]+'[0-9a-zA-Z]+\\|[^\n\'\"%%]\\)*\\(,\\|%s\\|%s\\)\[ \t]*\\(%%.*\\|\\)$" 2095 (format "\\(%s\\|%s\\|0'.\\|[0-9]+'[0-9a-zA-Z]+\\|[^\n\'\"%%]\\)*\\(,\\|%s\\|%s\\)\[ \t]*\\(%%.*\\|\\)$"
2066 prolog-quoted-atom-regexp prolog-string-regexp 2096 prolog-quoted-atom-regexp prolog-string-regexp
2067 prolog-left-paren prolog-left-indent-regexp)) 2097 prolog-left-paren prolog-left-indent-regexp))
2068 (progn 2098 (progn
2069 (goto-char oldpoint) 2099 (goto-char oldpoint)
2070 (setq ind (prolog-find-unmatched-paren (if prolog-paren-indent-p 2100 (setq ind (prolog-find-unmatched-paren
2071 'termdependent 2101 (if prolog-paren-indent-p
2072 'skipwhite))) 2102 'termdependent
2103 'skipwhite)))
2073 ;;(setq ind (prolog-find-unmatched-paren 'termdependent)) 2104 ;;(setq ind (prolog-find-unmatched-paren 'termdependent))
2074 ) 2105 )
2075 (goto-char oldpoint) 2106 (goto-char oldpoint)
2076 (setq ind (prolog-find-unmatched-paren nil)) 2107 (setq ind (prolog-find-unmatched-paren nil))
2077 )) 2108 ))
2078 2109
2079 2110
2080 ;; Return the indentation level 2111 ;; Return the indentation level
2081 ind 2112 ind
@@ -2117,18 +2148,12 @@ called."
2117 (skip-chars-forward " \t") 2148 (skip-chars-forward " \t")
2118 (current-column))) 2149 (current-column)))
2119 2150
2120(defun prolog-first-pos-on-line ()
2121 "Return the first position on the current line."
2122 (save-excursion
2123 (beginning-of-line)
2124 (point)))
2125
2126(defun prolog-paren-is-the-first-on-line-p () 2151(defun prolog-paren-is-the-first-on-line-p ()
2127 "Return t if the parenthesis under the point is the first one on the line. 2152 "Return t if the parenthesis under the point is the first one on the line.
2128Return nil otherwise. 2153Return nil otherwise.
2129Note: does not check if the point is actually at a parenthesis!" 2154Note: does not check if the point is actually at a parenthesis!"
2130 (save-excursion 2155 (save-excursion
2131 (let ((begofline (prolog-first-pos-on-line))) 2156 (let ((begofline (line-beginning-position)))
2132 (if (= begofline (point)) 2157 (if (= begofline (point))
2133 t 2158 t
2134 (if (prolog-goto-next-paren begofline) 2159 (if (prolog-goto-next-paren begofline)
@@ -2151,14 +2176,14 @@ If MODE is nil or not set then the parenthesis' exact column is returned."
2151 2176
2152 (let ((roundparen (looking-at "("))) 2177 (let ((roundparen (looking-at "(")))
2153 (if (looking-at prolog-left-paren) 2178 (if (looking-at prolog-left-paren)
2154 (let ((not-part-of-term 2179 (let ((not-part-of-term
2155 (save-excursion 2180 (save-excursion
2156 (backward-char 1) 2181 (backward-char 1)
2157 (looking-at "[ \t]")))) 2182 (looking-at "[ \t]"))))
2158 (if (eq mode nil) 2183 (if (eq mode nil)
2159 (current-column) 2184 (current-column)
2160 (if (and roundparen 2185 (if (and roundparen
2161 (eq mode 'termdependent) 2186 (eq mode 'termdependent)
2162 not-part-of-term) 2187 not-part-of-term)
2163 (+ (current-column) 2188 (+ (current-column)
2164 (if prolog-electric-tab-flag 2189 (if prolog-electric-tab-flag
@@ -2191,7 +2216,7 @@ If MODE is nil or not set then the parenthesis' exact column is returned."
2191A return value of n means n more left parentheses than right ones." 2216A return value of n means n more left parentheses than right ones."
2192 (save-excursion 2217 (save-excursion
2193 (end-of-line) 2218 (end-of-line)
2194 (prolog-region-paren-balance (prolog-first-pos-on-line) (point)))) 2219 (prolog-region-paren-balance (line-beginning-position) (point))))
2195 2220
2196(defun prolog-region-paren-balance (beg end) 2221(defun prolog-region-paren-balance (beg end)
2197 "Return the summed parenthesis balance in the region. 2222 "Return the summed parenthesis balance in the region.
@@ -2205,10 +2230,9 @@ The region is limited by BEG and END positions."
2205(defun prolog-goto-next-paren (limit-pos) 2230(defun prolog-goto-next-paren (limit-pos)
2206 "Move the point to the next parenthesis earlier in the buffer. 2231 "Move the point to the next parenthesis earlier in the buffer.
2207Return t if a match was found before LIMIT-POS. Return nil otherwise." 2232Return t if a match was found before LIMIT-POS. Return nil otherwise."
2208 (let (retval) 2233 (let ((retval (re-search-backward
2209 (setq retval (re-search-backward 2234 (concat prolog-left-paren "\\|" prolog-right-paren)
2210 (concat prolog-left-paren "\\|" prolog-right-paren) 2235 limit-pos t)))
2211 limit-pos t))
2212 2236
2213 ;; If a match was found but it was in a string or comment, then recurse 2237 ;; If a match was found but it was in a string or comment, then recurse
2214 (if (and retval (prolog-in-string-or-comment)) 2238 (if (and retval (prolog-in-string-or-comment))
@@ -2246,7 +2270,9 @@ Return:
2246 (end (point)) 2270 (end (point))
2247 (state (if prolog-use-prolog-tokenizer-flag 2271 (state (if prolog-use-prolog-tokenizer-flag
2248 (prolog-tokenize start end) 2272 (prolog-tokenize start end)
2249 (parse-partial-sexp start end)))) 2273 (if (fboundp 'syntax-ppss)
2274 (syntax-ppss)
2275 (parse-partial-sexp start end)))))
2250 (cond 2276 (cond
2251 ((nth 3 state) 'txt) ; String 2277 ((nth 3 state) 'txt) ; String
2252 ((nth 4 state) 'cmt) ; Comment 2278 ((nth 4 state) 'cmt) ; Comment
@@ -2279,9 +2305,9 @@ whitespace characters, parentheses, or then/else branches."
2279 (skip-chars-forward " \t") 2305 (skip-chars-forward " \t")
2280 (when (looking-at regexp) 2306 (when (looking-at regexp)
2281 ;; Treat "( If -> " lines specially. 2307 ;; Treat "( If -> " lines specially.
2282 ;;(if (looking-at "(.*->") 2308 ;;(setq incr (if (looking-at "(.*->")
2283 ;; (setq incr 2) 2309 ;; 2
2284 ;; (setq incr prolog-paren-indent)) 2310 ;; prolog-paren-indent))
2285 2311
2286 ;; work on all subsequent "->", "(", ";" 2312 ;; work on all subsequent "->", "(", ";"
2287 (while (looking-at regexp) 2313 (while (looking-at regexp)
@@ -2315,8 +2341,8 @@ between them)."
2315 (save-restriction 2341 (save-restriction
2316 ;; Widen to catch comment limits correctly. 2342 ;; Widen to catch comment limits correctly.
2317 (widen) 2343 (widen)
2318 (setq end (save-excursion (end-of-line) (point)) 2344 (setq end (line-end-position)
2319 beg (save-excursion (beginning-of-line) (point))) 2345 beg (line-beginning-position))
2320 (save-excursion 2346 (save-excursion
2321 (beginning-of-line) 2347 (beginning-of-line)
2322 (setq lit-type (if (search-forward-regexp "%" end t) 'line 'block)) 2348 (setq lit-type (if (search-forward-regexp "%" end t) 'line 'block))
@@ -2334,14 +2360,14 @@ between them)."
2334 (progn 2360 (progn
2335 (goto-char here) 2361 (goto-char here)
2336 (when (looking-at "/\\*") (forward-char 2)) 2362 (when (looking-at "/\\*") (forward-char 2))
2337 (when (and (looking-at "\\*") (> (point) (point-min)) 2363 (when (and (looking-at "\\*") (> (point) (point-min))
2338 (forward-char -1) (looking-at "/")) 2364 (forward-char -1) (looking-at "/"))
2339 (forward-char 1)) 2365 (forward-char 1))
2340 (when (save-excursion (search-backward "/*" nil t)) 2366 (when (save-excursion (search-backward "/*" nil t))
2341 (list (save-excursion (search-backward "/*") (point)) 2367 (list (save-excursion (search-backward "/*") (point))
2342 (or (search-forward "*/" nil t) (point-max)) lit-type))) 2368 (or (search-forward "*/" nil t) (point-max)) lit-type)))
2343 ;; line comment 2369 ;; line comment
2344 (setq lit-limits-b (- (point) 1) 2370 (setq lit-limits-b (- (point) 1)
2345 lit-limits-e end) 2371 lit-limits-e end)
2346 (condition-case nil 2372 (condition-case nil
2347 (if (progn (goto-char lit-limits-b) 2373 (if (progn (goto-char lit-limits-b)
@@ -2353,14 +2379,15 @@ between them)."
2353 ;; Go backward now 2379 ;; Go backward now
2354 (beginning-of-line) 2380 (beginning-of-line)
2355 (while (and (zerop (setq done (forward-line -1))) 2381 (while (and (zerop (setq done (forward-line -1)))
2356 (search-forward-regexp "^[ \t]*%" (save-excursion (end-of-line) (point)) t) 2382 (search-forward-regexp "^[ \t]*%"
2383 (line-end-position) t)
2357 (= (+ 1 col) (current-column))) 2384 (= (+ 1 col) (current-column)))
2358 (setq beg (- (point) 1))) 2385 (setq beg (- (point) 1)))
2359 (when (= done 0) 2386 (when (= done 0)
2360 (forward-line 1)) 2387 (forward-line 1))
2361 ;; We may have a line with code above... 2388 ;; We may have a line with code above...
2362 (when (and (zerop (setq done (forward-line -1))) 2389 (when (and (zerop (setq done (forward-line -1)))
2363 (search-forward "%" (save-excursion (end-of-line) (point)) t) 2390 (search-forward "%" (line-end-position) t)
2364 (= (+ 1 col) (current-column))) 2391 (= (+ 1 col) (current-column)))
2365 (setq beg (- (point) 1))) 2392 (setq beg (- (point) 1)))
2366 (when (= done 0) 2393 (when (= done 0)
@@ -2369,9 +2396,10 @@ between them)."
2369 (goto-char lit-limits-b) 2396 (goto-char lit-limits-b)
2370 (beginning-of-line) 2397 (beginning-of-line)
2371 (while (and (zerop (forward-line 1)) 2398 (while (and (zerop (forward-line 1))
2372 (search-forward-regexp "^[ \t]*%" (save-excursion (end-of-line) (point)) t) 2399 (search-forward-regexp "^[ \t]*%"
2400 (line-end-position) t)
2373 (= (+ 1 col) (current-column))) 2401 (= (+ 1 col) (current-column)))
2374 (setq end (save-excursion (end-of-line) (point)))) 2402 (setq end (line-end-position)))
2375 (list beg end lit-type)) 2403 (list beg end lit-type))
2376 (list lit-limits-b lit-limits-e lit-type) 2404 (list lit-limits-b lit-limits-e lit-type)
2377 ) 2405 )
@@ -2476,7 +2504,7 @@ where the parenthesis depth is zero, 'skipover which skips over
2476the current entity (e.g. a list, a string, etc.) and nil. 2504the current entity (e.g. a list, a string, etc.) and nil.
2477 2505
2478The function returns a list with the following information: 2506The function returns a list with the following information:
2479 0. parenthesis depth 2507 0. parenthesis depth
2480 3. 'atm if END is inside an atom 2508 3. 'atm if END is inside an atom
2481 'str if END is inside a string 2509 'str if END is inside a string
2482 'chr if END is in a character code expression (0'x) 2510 'chr if END is in a character code expression (0'x)
@@ -2517,7 +2545,7 @@ The rest of the elements are undefined."
2517 (setq endpos (point)) 2545 (setq endpos (point))
2518 (setq oldp (point)))) ; Continue tokenizing 2546 (setq oldp (point)))) ; Continue tokenizing
2519 (setq quoted 'atm))) 2547 (setq quoted 'atm)))
2520 2548
2521 ((looking-at "\"") 2549 ((looking-at "\"")
2522 ;; Find end of string 2550 ;; Find end of string
2523 (if (re-search-forward "[^\\]\"" end2 'limit) 2551 (if (re-search-forward "[^\\]\"" end2 'limit)
@@ -2539,7 +2567,7 @@ The rest of the elements are undefined."
2539 (setq depth (1- depth)) 2567 (setq depth (1- depth))
2540 (if (and 2568 (if (and
2541 (or (eq stopcond 'zerodepth) 2569 (or (eq stopcond 'zerodepth)
2542 (and (eq stopcond 'skipover) 2570 (and (eq stopcond 'skipover)
2543 (eq skiptype 'paren))) 2571 (eq skiptype 'paren)))
2544 (= depth 0)) 2572 (= depth 0))
2545 (progn 2573 (progn
@@ -2565,16 +2593,16 @@ The rest of the elements are undefined."
2565 ;; 0'char 2593 ;; 0'char
2566 ((looking-at "0'") 2594 ((looking-at "0'")
2567 (setq oldp (1+ (match-end 0))) 2595 (setq oldp (1+ (match-end 0)))
2568 (if (> oldp end) 2596 (if (> oldp end)
2569 (setq quoted 'chr))) 2597 (setq quoted 'chr)))
2570 2598
2571 ;; base'number 2599 ;; base'number
2572 ((looking-at "[0-9]+'") 2600 ((looking-at "[0-9]+'")
2573 (goto-char (match-end 0)) 2601 (goto-char (match-end 0))
2574 (skip-chars-forward "0-9a-zA-Z") 2602 (skip-chars-forward "0-9a-zA-Z")
2575 (setq oldp (point))) 2603 (setq oldp (point)))
2576 2604
2577 2605
2578 ) 2606 )
2579 (goto-char oldp) 2607 (goto-char oldp)
2580 )) ; End of while 2608 )) ; End of while
@@ -2595,7 +2623,7 @@ The rest of the elements are undefined."
2595 (next-open (save-excursion (search-forward "/*" nil t))) 2623 (next-open (save-excursion (search-forward "/*" nil t)))
2596 (prev-open (save-excursion (search-backward "/*" nil t))) 2624 (prev-open (save-excursion (search-backward "/*" nil t)))
2597 (prev-close (save-excursion (search-backward "*/" nil t))) 2625 (prev-close (save-excursion (search-backward "*/" nil t)))
2598 (unmatched-next-close (and next-close 2626 (unmatched-next-close (and next-close
2599 (or (not next-open) 2627 (or (not next-open)
2600 (> next-open next-close)))) 2628 (> next-open next-close))))
2601 (unmatched-prev-open (and prev-open 2629 (unmatched-prev-open (and prev-open
@@ -2631,18 +2659,15 @@ The rest of the elements are undefined."
2631 ;; Otherwise, ask for the predicate name and then call the function 2659 ;; Otherwise, ask for the predicate name and then call the function
2632 ;; in prolog-help-function-i 2660 ;; in prolog-help-function-i
2633 (t 2661 (t
2634 (let* (word 2662 (let* ((word (prolog-atom-under-point))
2635 predicate 2663 (predicate (read-string
2636 ;point
2637 )
2638 (setq word (prolog-atom-under-point))
2639 (setq predicate (read-from-minibuffer
2640 (format "Help on predicate%s: " 2664 (format "Help on predicate%s: "
2641 (if word 2665 (if word
2642 (concat " (default " word ")") 2666 (concat " (default " word ")")
2643 "")))) 2667 ""))
2644 (if (string= predicate "") 2668 nil nil word))
2645 (setq predicate word)) 2669 ;;point
2670 )
2646 (if prolog-help-function-i 2671 (if prolog-help-function-i
2647 (funcall prolog-help-function-i predicate) 2672 (funcall prolog-help-function-i predicate)
2648 (error "Sorry, no help method defined for this Prolog system.")))) 2673 (error "Sorry, no help method defined for this Prolog system."))))
@@ -2729,7 +2754,7 @@ This function is only available when `prolog-system' is set to `swi'."
2729 (let ((pred (prolog-read-predicate))) 2754 (let ((pred (prolog-read-predicate)))
2730 (prolog-goto-predicate-info pred))) 2755 (prolog-goto-predicate-info pred)))
2731 2756
2732(defvar prolog-info-alist nil 2757(defvar prolog-info-alist nil
2733 "Alist with all builtin predicates. 2758 "Alist with all builtin predicates.
2734Only for internal use by `prolog-find-documentation'") 2759Only for internal use by `prolog-find-documentation'")
2735 2760
@@ -2745,14 +2770,13 @@ Only for internal use by `prolog-find-documentation'")
2745 (string-match "\\(.*\\)/\\([0-9]+\\).*$" predicate) 2770 (string-match "\\(.*\\)/\\([0-9]+\\).*$" predicate)
2746 (let ((buffer (current-buffer)) 2771 (let ((buffer (current-buffer))
2747 (name (match-string 1 predicate)) 2772 (name (match-string 1 predicate))
2748 (arity (match-string 2 predicate)) 2773 (arity (string-to-number (match-string 2 predicate)))
2749 ;oldp 2774 ;oldp
2750 ;(str (regexp-quote predicate)) 2775 ;(str (regexp-quote predicate))
2751 ) 2776 )
2752 (setq arity (string-to-number arity))
2753 (pop-to-buffer nil) 2777 (pop-to-buffer nil)
2754 2778
2755 (Info-goto-node 2779 (Info-goto-node
2756 prolog-info-predicate-index) ;; We must be in the SICStus pages 2780 prolog-info-predicate-index) ;; We must be in the SICStus pages
2757 (Info-goto-node (car (cdr (assoc predicate prolog-info-alist)))) 2781 (Info-goto-node (car (cdr (assoc predicate prolog-info-alist))))
2758 2782
@@ -2766,25 +2790,23 @@ Only for internal use by `prolog-find-documentation'")
2766 "Read a PredSpec from the user. 2790 "Read a PredSpec from the user.
2767Returned value is a string \"FUNCTOR/ARITY\". 2791Returned value is a string \"FUNCTOR/ARITY\".
2768Interaction supports completion." 2792Interaction supports completion."
2769 (let ((initial (prolog-atom-under-point)) 2793 (let ((default (prolog-atom-under-point)))
2770 answer) 2794 ;; If the predicate index is not yet built, do it now
2771 ;; If the predicate index is not yet built, do it now 2795 (if (not prolog-info-alist)
2772 (if (not prolog-info-alist)
2773 (prolog-build-info-alist)) 2796 (prolog-build-info-alist))
2774 ;; Test if the initial string could be the base for completion. 2797 ;; Test if the default string could be the base for completion.
2775 ;; Discard it if not. 2798 ;; Discard it if not.
2776 (if (eq (try-completion initial prolog-info-alist) nil) 2799 (if (eq (try-completion default prolog-info-alist) nil)
2777 (setq initial "")) 2800 (setq default nil))
2778 ;; Read the PredSpec from the user 2801 ;; Read the PredSpec from the user
2779 (setq answer (completing-read 2802 (completing-read
2780 "Help on predicate: " 2803 (if (zerop (length default))
2781 prolog-info-alist nil t initial)) 2804 "Help on predicate: "
2782 (if (equal answer "") 2805 (concat "Help on predicate (default " default "): "))
2783 initial 2806 prolog-info-alist nil t nil nil default)))
2784 answer)))
2785 2807
2786(defun prolog-build-info-alist (&optional verbose) 2808(defun prolog-build-info-alist (&optional verbose)
2787 "Build an alist of all builtins and library predicates. 2809 "Build an alist of all builtins and library predicates.
2788Each element is of the form (\"NAME/ARITY\" . (INFO-NODE1 INFO-NODE2 ...)). 2810Each element is of the form (\"NAME/ARITY\" . (INFO-NODE1 INFO-NODE2 ...)).
2789Typically there is just one Info node associated with each name 2811Typically there is just one Info node associated with each name
2790If an optional argument VERBOSE is non-nil, print messages at the beginning 2812If an optional argument VERBOSE is non-nil, print messages at the beginning
@@ -2815,7 +2837,7 @@ and end of list building."
2815 info-node) 2837 info-node)
2816 (beginning-of-line) 2838 (beginning-of-line)
2817 ;; Extract the info node name 2839 ;; Extract the info node name
2818 (setq info-node (progn 2840 (setq info-node (progn
2819 (re-search-forward ":[ \t]*\\([^:]+\\).$") 2841 (re-search-forward ":[ \t]*\\([^:]+\\).$")
2820 (match-string 1) 2842 (match-string 1)
2821 )) 2843 ))
@@ -2848,18 +2870,18 @@ and end of list building."
2848 (setq i (1+ i))) 2870 (setq i (1+ i)))
2849 str1)) 2871 str1))
2850 2872
2851;(defun prolog-temporary-file () 2873;;(defun prolog-temporary-file ()
2852; "Make temporary file name for compilation." 2874;; "Make temporary file name for compilation."
2853; (make-temp-name 2875;; (make-temp-name
2854; (concat 2876;; (concat
2855; (or 2877;; (or
2856; (getenv "TMPDIR") 2878;; (getenv "TMPDIR")
2857; (getenv "TEMP") 2879;; (getenv "TEMP")
2858; (getenv "TMP") 2880;; (getenv "TMP")
2859; (getenv "SYSTEMP") 2881;; (getenv "SYSTEMP")
2860; "/tmp") 2882;; "/tmp")
2861; "/prolcomp"))) 2883;; "/prolcomp")))
2862;(setq prolog-temp-filename (prolog-bsts (prolog-temporary-file))) 2884;;(setq prolog-temp-filename (prolog-bsts (prolog-temporary-file)))
2863 2885
2864(defun prolog-temporary-file () 2886(defun prolog-temporary-file ()
2865 "Make temporary file name for compilation." 2887 "Make temporary file name for compilation."
@@ -2868,36 +2890,10 @@ and end of list building."
2868 (progn 2890 (progn
2869 (write-region "" nil prolog-temporary-file-name nil 'silent) 2891 (write-region "" nil prolog-temporary-file-name nil 'silent)
2870 prolog-temporary-file-name) 2892 prolog-temporary-file-name)
2871 ;; Actually create the file and set `prolog-temporary-file-name' accordingly 2893 ;; Actually create the file and set `prolog-temporary-file-name'
2872 (let* ((umask (default-file-modes)) 2894 ;; accordingly.
2873 (temporary-file-directory (or 2895 (setq prolog-temporary-file-name
2874 (getenv "TMPDIR") 2896 (make-temp-file "prolcomp" nil ".pl"))))
2875 (getenv "TEMP")
2876 (getenv "TMP")
2877 (getenv "SYSTEMP")
2878 "/tmp"))
2879 (prefix (expand-file-name "prolcomp" temporary-file-directory))
2880 (suffix ".pl")
2881 file)
2882 (unwind-protect
2883 (progn
2884 ;; Create temp files with strict access rights.
2885 (set-default-file-modes #o700)
2886 (while (condition-case ()
2887 (progn
2888 (setq file (concat (make-temp-name prefix) suffix))
2889 ;; (concat (make-temp-name "/tmp/prolcomp") ".pl")
2890 (unless (file-exists-p file)
2891 (write-region "" nil file nil 'silent))
2892 nil)
2893 (file-already-exists t))
2894 ;; the file was somehow created by someone else between
2895 ;; `make-temp-name' and `write-region', let's try again.
2896 nil)
2897 (setq prolog-temporary-file-name file))
2898 ;; Reset the umask.
2899 (set-default-file-modes umask)))
2900 ))
2901 2897
2902(defun prolog-goto-prolog-process-buffer () 2898(defun prolog-goto-prolog-process-buffer ()
2903 "Switch to the prolog process buffer and go to its end." 2899 "Switch to the prolog process buffer and go to its end."
@@ -2931,6 +2927,14 @@ and end of list building."
2931 ;; Avoid compile warnings by using eval 2927 ;; Avoid compile warnings by using eval
2932 (eval '(pltrace-off)))) 2928 (eval '(pltrace-off))))
2933 2929
2930(defun prolog-toggle-sicstus-sd ()
2931 ;; FIXME: Use define-minor-mode.
2932 "Toggle the source level debugging facilities of SICStus 3.7 and later."
2933 (interactive)
2934 (if prolog-use-sicstus-sd
2935 (prolog-disable-sicstus-sd)
2936 (prolog-enable-sicstus-sd)))
2937
2934(defun prolog-debug-on (&optional arg) 2938(defun prolog-debug-on (&optional arg)
2935 "Enable debugging. 2939 "Enable debugging.
2936When called with prefix argument ARG, disable debugging instead." 2940When called with prefix argument ARG, disable debugging instead."
@@ -2985,7 +2989,7 @@ When called with prefix argument ARG, disable zipping instead."
2985;; (defun prolog-create-predicate-index () 2989;; (defun prolog-create-predicate-index ()
2986;; "Create an index for all predicates in the buffer." 2990;; "Create an index for all predicates in the buffer."
2987;; (let ((predlist '()) 2991;; (let ((predlist '())
2988;; clauseinfo 2992;; clauseinfo
2989;; object 2993;; object
2990;; pos 2994;; pos
2991;; ) 2995;; )
@@ -2997,15 +3001,15 @@ When called with prefix argument ARG, disable zipping instead."
2997;; (setq object (prolog-in-object)) 3001;; (setq object (prolog-in-object))
2998;; (setq predlist (append 3002;; (setq predlist (append
2999;; predlist 3003;; predlist
3000;; (list (cons 3004;; (list (cons
3001;; (if (and (eq prolog-system 'sicstus) 3005;; (if (and (eq prolog-system 'sicstus)
3002;; (prolog-in-object)) 3006;; (prolog-in-object))
3003;; (format "%s::%s/%d" 3007;; (format "%s::%s/%d"
3004;; object 3008;; object
3005;; (nth 0 clauseinfo) 3009;; (nth 0 clauseinfo)
3006;; (nth 1 clauseinfo)) 3010;; (nth 1 clauseinfo))
3007;; (format "%s/%d" 3011;; (format "%s/%d"
3008;; (nth 0 clauseinfo) 3012;; (nth 0 clauseinfo)
3009;; (nth 1 clauseinfo))) 3013;; (nth 1 clauseinfo)))
3010;; pos 3014;; pos
3011;; )))) 3015;; ))))
@@ -3020,12 +3024,12 @@ When called with prefix argument ARG, disable zipping instead."
3020 nil 3024 nil
3021 (if (and (eq prolog-system 'sicstus) 3025 (if (and (eq prolog-system 'sicstus)
3022 object) 3026 object)
3023 (format "%s::%s/%d" 3027 (format "%s::%s/%d"
3024 object 3028 object
3025 (nth 0 state) 3029 (nth 0 state)
3026 (nth 1 state)) 3030 (nth 1 state))
3027 (format "%s/%d" 3031 (format "%s/%d"
3028 (nth 0 state) 3032 (nth 0 state)
3029 (nth 1 state))) 3033 (nth 1 state)))
3030 )))) 3034 ))))
3031 3035
@@ -3050,14 +3054,14 @@ STRING should be given if the last search was by `string-match' on STRING."
3050 ;; Find first clause, unless it was a directive 3054 ;; Find first clause, unless it was a directive
3051 (if (and (not (looking-at "[:?]-")) 3055 (if (and (not (looking-at "[:?]-"))
3052 (not (looking-at "[ \t]*[%/]")) ; Comment 3056 (not (looking-at "[ \t]*[%/]")) ; Comment
3053 3057
3054 ) 3058 )
3055 (let* ((pinfo (prolog-clause-info)) 3059 (let* ((pinfo (prolog-clause-info))
3056 (predname (nth 0 pinfo)) 3060 (predname (nth 0 pinfo))
3057 (arity (nth 1 pinfo)) 3061 (arity (nth 1 pinfo))
3058 (op (point))) 3062 (op (point)))
3059 (while (and (re-search-backward 3063 (while (and (re-search-backward
3060 (format "^%s\\([(\\.]\\| *%s\\)" 3064 (format "^%s\\([(\\.]\\| *%s\\)"
3061 predname prolog-head-delimiter) nil t) 3065 predname prolog-head-delimiter) nil t)
3062 (= arity (nth 1 (prolog-clause-info))) 3066 (= arity (nth 1 (prolog-clause-info)))
3063 ) 3067 )
@@ -3107,7 +3111,7 @@ STRING should be given if the last search was by `string-match' on STRING."
3107 ;; It was not a directive, find the last clause 3111 ;; It was not a directive, find the last clause
3108 (while (and notdone 3112 (while (and notdone
3109 (re-search-forward 3113 (re-search-forward
3110 (format "^%s\\([(\\.]\\| *%s\\)" 3114 (format "^%s\\([(\\.]\\| *%s\\)"
3111 predname prolog-head-delimiter) nil t) 3115 predname prolog-head-delimiter) nil t)
3112 (= arity (nth 1 (prolog-clause-info)))) 3116 (= arity (nth 1 (prolog-clause-info))))
3113 (setq oldp (point)) 3117 (setq oldp (point))
@@ -3127,17 +3131,17 @@ objects (relevent only if 'prolog-system' is set to 'sicstus)."
3127 (let ((notdone t) 3131 (let ((notdone t)
3128 (retval (point-min))) 3132 (retval (point-min)))
3129 (end-of-line) 3133 (end-of-line)
3130 3134
3131 ;; SICStus object? 3135 ;; SICStus object?
3132 (if (and (not not-allow-methods) 3136 (if (and (not not-allow-methods)
3133 (eq prolog-system 'sicstus) 3137 (eq prolog-system 'sicstus)
3134 (prolog-in-object)) 3138 (prolog-in-object))
3135 (while (and 3139 (while (and
3136 notdone 3140 notdone
3137 ;; Search for a head or a fact 3141 ;; Search for a head or a fact
3138 (re-search-backward 3142 (re-search-backward
3139 ;; If in object, then find method start. 3143 ;; If in object, then find method start.
3140 ;; "^[ \t]+[a-z$].*\\(:-\\|&\\|:: {\\|,\\)" 3144 ;; "^[ \t]+[a-z$].*\\(:-\\|&\\|:: {\\|,\\)"
3141 "^[ \t]+[a-z$].*\\(:-\\|&\\|:: {\\)" ; The comma causes 3145 "^[ \t]+[a-z$].*\\(:-\\|&\\|:: {\\)" ; The comma causes
3142 ; problems since we cannot assume 3146 ; problems since we cannot assume
3143 ; that the line starts at column 0, 3147 ; that the line starts at column 0,
@@ -3152,8 +3156,8 @@ objects (relevent only if 'prolog-system' is set to 'sicstus)."
3152 ) ; End of while 3156 ) ; End of while
3153 3157
3154 ;; Not in object 3158 ;; Not in object
3155 (while (and 3159 (while (and
3156 notdone 3160 notdone
3157 ;; Search for a text at beginning of a line 3161 ;; Search for a text at beginning of a line
3158 ;; ###### 3162 ;; ######
3159 ;; (re-search-backward "^[a-z$']" nil t)) 3163 ;; (re-search-backward "^[a-z$']" nil t))
@@ -3172,7 +3176,7 @@ objects (relevent only if 'prolog-system' is set to 'sicstus)."
3172 (setq notdone nil))) 3176 (setq notdone nil)))
3173 ((and (= bal 0) 3177 ((and (= bal 0)
3174 (looking-at 3178 (looking-at
3175 (format ".*\\(\\.\\|%s\\|!,\\)[ \t]*\\(%%.*\\|\\)$" 3179 (format ".*\\(\\.\\|%s\\|!,\\)[ \t]*\\(%%.*\\|\\)$"
3176 prolog-head-delimiter))) 3180 prolog-head-delimiter)))
3177 ;; Start of clause found if the line ends with a '.' or 3181 ;; Start of clause found if the line ends with a '.' or
3178 ;; a prolog-head-delimiter 3182 ;; a prolog-head-delimiter
@@ -3182,7 +3186,7 @@ objects (relevent only if 'prolog-system' is set to 'sicstus)."
3182 ) 3186 )
3183 (t nil) ; Do nothing 3187 (t nil) ; Do nothing
3184 )))) 3188 ))))
3185 3189
3186 retval))) 3190 retval)))
3187 3191
3188(defun prolog-clause-end (&optional not-allow-methods) 3192(defun prolog-clause-end (&optional not-allow-methods)
@@ -3190,8 +3194,8 @@ objects (relevent only if 'prolog-system' is set to 'sicstus)."
3190If NOTALLOWMETHODS is non-nil then do not match on methods in 3194If NOTALLOWMETHODS is non-nil then do not match on methods in
3191objects (relevent only if 'prolog-system' is set to 'sicstus)." 3195objects (relevent only if 'prolog-system' is set to 'sicstus)."
3192 (save-excursion 3196 (save-excursion
3193 (beginning-of-line) ; Necessary since we use "^...." for the search 3197 (beginning-of-line) ; Necessary since we use "^...." for the search.
3194 (if (re-search-forward 3198 (if (re-search-forward
3195 (if (and (not not-allow-methods) 3199 (if (and (not not-allow-methods)
3196 (eq prolog-system 'sicstus) 3200 (eq prolog-system 'sicstus)
3197 (prolog-in-object)) 3201 (prolog-in-object))
@@ -3212,43 +3216,43 @@ objects (relevent only if 'prolog-system' is set to 'sicstus)."
3212 3216
3213(defun prolog-clause-info () 3217(defun prolog-clause-info ()
3214 "Return a (name arity) list for the current clause." 3218 "Return a (name arity) list for the current clause."
3215 (let (predname (arity 0)) 3219 (save-excursion
3216 (save-excursion 3220 (goto-char (prolog-clause-start))
3217 (goto-char (prolog-clause-start)) 3221 (let* ((op (point))
3218 (let ((op (point))) 3222 (predname
3219 (if (looking-at prolog-atom-char-regexp) 3223 (if (looking-at prolog-atom-char-regexp)
3220 (progn 3224 (progn
3221 (skip-chars-forward "^ (\\.") 3225 (skip-chars-forward "^ (\\.")
3222 (setq predname (buffer-substring op (point)))) 3226 (buffer-substring op (point)))
3223 (setq predname "")) 3227 ""))
3224 ;; Retrieve the arity 3228 (arity 0))
3225 (if (looking-at prolog-left-paren) 3229 ;; Retrieve the arity.
3226 (let ((endp (save-excursion 3230 (if (looking-at prolog-left-paren)
3227 (prolog-forward-list) (point)))) 3231 (let ((endp (save-excursion
3228 (setq arity 1) 3232 (prolog-forward-list) (point))))
3229 (forward-char 1) ; Skip the opening paren 3233 (setq arity 1)
3230 (while (progn 3234 (forward-char 1) ; Skip the opening paren.
3231 (skip-chars-forward "^[({,'\"") 3235 (while (progn
3232 (< (point) endp)) 3236 (skip-chars-forward "^[({,'\"")
3233 (if (looking-at ",") 3237 (< (point) endp))
3234 (progn 3238 (if (looking-at ",")
3235 (setq arity (1+ arity)) 3239 (progn
3236 (forward-char 1) ; Skip the comma 3240 (setq arity (1+ arity))
3237 ) 3241 (forward-char 1) ; Skip the comma.
3238 ;; We found a string, list or something else we want 3242 )
3239 ;; to skip over. Always use prolog-tokenize, 3243 ;; We found a string, list or something else we want
3240 ;; parse-partial-sexp does not have a 'skipover mode. 3244 ;; to skip over. Always use prolog-tokenize,
3241 (goto-char (nth 5 (prolog-tokenize (point) endp 'skipover)))) 3245 ;; parse-partial-sexp does not have a 'skipover mode.
3242 ))) 3246 (goto-char (nth 5 (prolog-tokenize (point) endp 'skipover))))
3243 (list predname arity) 3247 )))
3244 )))) 3248 (list predname arity))))
3245 3249
3246(defun prolog-in-object () 3250(defun prolog-in-object ()
3247 "Return object name if the point is inside a SICStus object definition." 3251 "Return object name if the point is inside a SICStus object definition."
3248 ;; Return object name if the last line that starts with a character 3252 ;; Return object name if the last line that starts with a character
3249 ;; that is neither white space nor a comment start 3253 ;; that is neither white space nor a comment start
3250 (save-excursion 3254 (save-excursion
3251 (if (save-excursion 3255 (if (save-excursion
3252 (beginning-of-line) 3256 (beginning-of-line)
3253 (looking-at "\\([^\n ]+\\)[ \t]*::[ \t]*{")) 3257 (looking-at "\\([^\n ]+\\)[ \t]*::[ \t]*{"))
3254 ;; We were in the head of the object 3258 ;; We were in the head of the object
@@ -3275,6 +3279,7 @@ objects (relevent only if 'prolog-system' is set to 'sicstus)."
3275 (let ((bal 0) 3279 (let ((bal 0)
3276 (paren-regexp (concat prolog-left-paren "\\|" prolog-right-paren)) 3280 (paren-regexp (concat prolog-left-paren "\\|" prolog-right-paren))
3277 (notdone t)) 3281 (notdone t))
3282 ;; FIXME: Doesn't this incorrectly count 0'( and 0') ?
3278 (while (and notdone (re-search-backward paren-regexp nil t)) 3283 (while (and notdone (re-search-backward paren-regexp nil t))
3279 (cond 3284 (cond
3280 ((looking-at prolog-left-paren) 3285 ((looking-at prolog-left-paren)
@@ -3426,10 +3431,10 @@ a new comment is created."
3426 (beginning-of-line) 3431 (beginning-of-line)
3427 (if (or (not nocreate) 3432 (if (or (not nocreate)
3428 (and 3433 (and
3429 (re-search-forward 3434 (re-search-forward
3430 (format "^\\(\\(%s\\|%s\\|[^\n\'\"%%]\\)*\\)%% *" 3435 (format "^\\(\\(%s\\|%s\\|[^\n\'\"%%]\\)*\\)%% *"
3431 prolog-quoted-atom-regexp prolog-string-regexp) 3436 prolog-quoted-atom-regexp prolog-string-regexp)
3432 (save-excursion (end-of-line) (point)) 'limit) 3437 (line-end-position) 'limit)
3433 (progn 3438 (progn
3434 (goto-char (match-beginning 0)) 3439 (goto-char (match-beginning 0))
3435 (not (eq (prolog-in-string-or-comment) 'txt))))) 3440 (not (eq (prolog-in-string-or-comment) 'txt)))))
@@ -3459,9 +3464,8 @@ a new comment is created."
3459(defun prolog-mark-predicate () 3464(defun prolog-mark-predicate ()
3460 "Put mark at the end of this predicate and move point to the beginning." 3465 "Put mark at the end of this predicate and move point to the beginning."
3461 (interactive) 3466 (interactive)
3462 (let (pos) 3467 (goto-char (prolog-pred-end))
3463 (goto-char (prolog-pred-end)) 3468 (let ((pos (point)))
3464 (setq pos (point))
3465 (forward-line 1) 3469 (forward-line 1)
3466 (beginning-of-line) 3470 (beginning-of-line)
3467 (set-mark (point)) 3471 (set-mark (point))
@@ -3551,26 +3555,26 @@ When called with prefix argument ARG, insert just dot."
3551 arg 3555 arg
3552 (prolog-in-string-or-comment) 3556 (prolog-in-string-or-comment)
3553 ;; Do not be electric in a floating point number or an operator 3557 ;; Do not be electric in a floating point number or an operator
3554 (not 3558 (not
3555 (or 3559 (or
3556 ;; (re-search-backward 3560 ;; (re-search-backward
3557 ;; ###### 3561 ;; ######
3558 ;; "\\(^\\|[])}a-zA-Z_!'0-9]+\\)[ \t]*\\=" nil t))) 3562 ;; "\\(^\\|[])}a-zA-Z_!'0-9]+\\)[ \t]*\\=" nil t)))
3559 (save-excursion 3563 (save-excursion
3560 (re-search-backward 3564 (re-search-backward
3561 ;; "\\(^\\|[])}_!'0-9]+\\)[ \t]*\\=" nil t))) 3565 ;; "\\(^\\|[])}_!'0-9]+\\)[ \t]*\\=" nil t)))
3562 "\\(^\\|[])}_!'0-9]+\\)[ \t]*\\=" 3566 "\\(^\\|[])}_!'0-9]+\\)[ \t]*\\="
3563 nil t)) 3567 nil t))
3564 (save-excursion 3568 (save-excursion
3565 (re-search-backward 3569 (re-search-backward
3566 ;; "\\(^\\|[])}a-zA-Z]+\\)[ \t]*\\=" nil t))) 3570 ;; "\\(^\\|[])}a-zA-Z]+\\)[ \t]*\\=" nil t)))
3567 (format "\\(^\\|[])}%s]+\\)[ \t]*\\=" 3571 (format "\\(^\\|[])}%s]+\\)[ \t]*\\="
3568 prolog-lower-case-string) ;FIXME: [:lower:] 3572 prolog-lower-case-string) ;FIXME: [:lower:]
3569 nil t)) 3573 nil t))
3570 (save-excursion 3574 (save-excursion
3571 (re-search-backward 3575 (re-search-backward
3572 ;; "\\(^\\|[])}a-zA-Z]+\\)[ \t]*\\=" nil t))) 3576 ;; "\\(^\\|[])}a-zA-Z]+\\)[ \t]*\\=" nil t)))
3573 (format "\\(^\\|[])}%s]+\\)[ \t]*\\=" 3577 (format "\\(^\\|[])}%s]+\\)[ \t]*\\="
3574 prolog-upper-case-string) ;FIXME: [:upper:] 3578 prolog-upper-case-string) ;FIXME: [:upper:]
3575 nil t)) 3579 nil t))
3576 ) 3580 )
@@ -3590,9 +3594,9 @@ When called with prefix argument ARG, insert just dot."
3590 (looking-at "[ \t]+$")) 3594 (looking-at "[ \t]+$"))
3591 (prolog-insert-predicate-template) 3595 (prolog-insert-predicate-template)
3592 (when prolog-electric-dot-full-predicate-template 3596 (when prolog-electric-dot-full-predicate-template
3593 (save-excursion 3597 (save-excursion
3594 (end-of-line) 3598 (end-of-line)
3595 (insert ".\n")))) 3599 (insert ".\n"))))
3596 ;; Default 3600 ;; Default
3597 (t 3601 (t
3598 (insert ".\n")) 3602 (insert ".\n"))
@@ -3607,22 +3611,21 @@ If the point is not on a variable then insert underscore."
3607 (interactive) 3611 (interactive)
3608 (if prolog-electric-underscore-flag 3612 (if prolog-electric-underscore-flag
3609 (let (;start 3613 (let (;start
3610 (oldcase case-fold-search) 3614 (case-fold-search nil)
3611 (oldp (point))) 3615 (oldp (point)))
3612 (setq case-fold-search nil)
3613 ;; ###### 3616 ;; ######
3614 ;;(skip-chars-backward "a-zA-Z_") 3617 ;;(skip-chars-backward "a-zA-Z_")
3615 (skip-chars-backward 3618 (skip-chars-backward
3616 (format "%s%s_" 3619 (format "%s%s_"
3617 ;; FIXME: Why not "a-zA-Z"? 3620 ;; FIXME: Why not "a-zA-Z"?
3618 prolog-lower-case-string 3621 prolog-lower-case-string
3619 prolog-upper-case-string)) 3622 prolog-upper-case-string))
3620 3623
3621 ;(setq start (point)) 3624 ;(setq start (point))
3622 (if (and (not (prolog-in-string-or-comment)) 3625 (if (and (not (prolog-in-string-or-comment))
3623 ;; ###### 3626 ;; ######
3624 ;; (looking-at "\\<[_A-Z][a-zA-Z_0-9]*\\>")) 3627 ;; (looking-at "\\<[_A-Z][a-zA-Z_0-9]*\\>"))
3625 (looking-at (format "\\<[_%s][%s%s_0-9]*\\>" 3628 (looking-at (format "\\<[_%s][%s%s_0-9]*\\>"
3626 ;; FIXME: Use [:upper:] and friends. 3629 ;; FIXME: Use [:upper:] and friends.
3627 prolog-upper-case-string 3630 prolog-upper-case-string
3628 prolog-lower-case-string 3631 prolog-lower-case-string
@@ -3632,7 +3635,6 @@ If the point is not on a variable then insert underscore."
3632 (skip-chars-forward ", \t\n")) 3635 (skip-chars-forward ", \t\n"))
3633 (goto-char oldp) 3636 (goto-char oldp)
3634 (self-insert-command 1)) 3637 (self-insert-command 1))
3635 (setq case-fold-search oldcase)
3636 ) 3638 )
3637 (self-insert-command 1)) 3639 (self-insert-command 1))
3638 ) 3640 )
@@ -3648,7 +3650,7 @@ PREFIX is the prefix of the search regexp."
3648 prefix)) 3650 prefix))
3649 (regexp (concat prefix functor)) 3651 (regexp (concat prefix functor))
3650 (i 1)) 3652 (i 1))
3651 3653
3652 ;; Build regexp for the search if the arity is > 0 3654 ;; Build regexp for the search if the arity is > 0
3653 (if (= arity 0) 3655 (if (= arity 0)
3654 ;; Add that the functor must be at the end of a word. This 3656 ;; Add that the functor must be at the end of a word. This
@@ -3661,7 +3663,7 @@ PREFIX is the prefix of the search regexp."
3661 (setq regexp (concat regexp ".+,")) 3663 (setq regexp (concat regexp ".+,"))
3662 (setq i (1+ i))) 3664 (setq i (1+ i)))
3663 (setq regexp (concat regexp ".+)"))) 3665 (setq regexp (concat regexp ".+)")))
3664 3666
3665 ;; Search, and return position 3667 ;; Search, and return position
3666 (if (re-search-forward regexp nil t) 3668 (if (re-search-forward regexp nil t)
3667 (goto-char (match-beginning 0)) 3669 (goto-char (match-beginning 0))
@@ -3672,14 +3674,12 @@ PREFIX is the prefix of the search regexp."
3672 "Replace all variables within a region BEG to END by anonymous variables." 3674 "Replace all variables within a region BEG to END by anonymous variables."
3673 (interactive "r") 3675 (interactive "r")
3674 (save-excursion 3676 (save-excursion
3675 (let ((oldcase case-fold-search)) 3677 (let ((case-fold-search nil))
3676 (setq case-fold-search nil)
3677 (goto-char end) 3678 (goto-char end)
3678 (while (re-search-backward "\\<[A-Z_][a-zA-Z_0-9]*\\>" beg t) 3679 (while (re-search-backward "\\<[A-Z_][a-zA-Z_0-9]*\\>" beg t)
3679 (progn 3680 (progn
3680 (replace-match "_") 3681 (replace-match "_")
3681 (backward-char))) 3682 (backward-char)))
3682 (setq case-fold-search oldcase)
3683 ))) 3683 )))
3684 3684
3685 3685
@@ -3687,13 +3687,13 @@ PREFIX is the prefix of the search regexp."
3687 "Set the `prolog-atom-char-regexp' and `prolog-atom-regexp' variables. 3687 "Set the `prolog-atom-char-regexp' and `prolog-atom-regexp' variables.
3688Must be called after `prolog-build-case-strings'." 3688Must be called after `prolog-build-case-strings'."
3689 (setq prolog-atom-char-regexp 3689 (setq prolog-atom-char-regexp
3690 (format "[%s%s0-9_$]" 3690 (format "[%s%s0-9_$]"
3691 ;; FIXME: why not a-zA-Z? 3691 ;; FIXME: why not a-zA-Z?
3692 prolog-lower-case-string 3692 prolog-lower-case-string
3693 prolog-upper-case-string)) 3693 prolog-upper-case-string))
3694 (setq prolog-atom-regexp 3694 (setq prolog-atom-regexp
3695 (format "[%s$]%s*" 3695 (format "[%s$]%s*"
3696 prolog-lower-case-string 3696 prolog-lower-case-string
3697 prolog-atom-char-regexp)) 3697 prolog-atom-char-regexp))
3698 ) 3698 )
3699 3699
@@ -3705,15 +3705,15 @@ Uses the current case-table for extracting the relevant information."
3705 ;; Use `map-char-table' if it is defined. Otherwise enumerate all 3705 ;; Use `map-char-table' if it is defined. Otherwise enumerate all
3706 ;; numbers between 0 and 255. `map-char-table' is probably safer. 3706 ;; numbers between 0 and 255. `map-char-table' is probably safer.
3707 ;; 3707 ;;
3708 ;; `map-char-table' causes problems under Emacs 23.0.0.1, the 3708 ;; `map-char-table' causes problems under Emacs 23.0.0.1, the
3709 ;; while loop seems to do its job well (Ryszard Szopa) 3709 ;; while loop seems to do its job well (Ryszard Szopa)
3710 ;; 3710 ;;
3711 ;;(if (and (not (featurep 'xemacs)) 3711 ;;(if (and (not (featurep 'xemacs))
3712 ;; (fboundp 'map-char-table)) 3712 ;; (fboundp 'map-char-table))
3713 ;; (map-char-table 3713 ;; (map-char-table
3714 ;; (lambda (key value) 3714 ;; (lambda (key value)
3715 ;; (cond 3715 ;; (cond
3716 ;; ((and 3716 ;; ((and
3717 ;; (eq (prolog-int-to-char key) (downcase key)) 3717 ;; (eq (prolog-int-to-char key) (downcase key))
3718 ;; (eq (prolog-int-to-char key) (upcase key))) 3718 ;; (eq (prolog-int-to-char key) (upcase key)))
3719 ;; ;; Do nothing if upper and lower case are the same 3719 ;; ;; Do nothing if upper and lower case are the same
@@ -3729,8 +3729,8 @@ Uses the current case-table for extracting the relevant information."
3729 ;; `map-char-table' was undefined. 3729 ;; `map-char-table' was undefined.
3730 (let ((key 0)) 3730 (let ((key 0))
3731 (while (< key 256) 3731 (while (< key 256)
3732 (cond 3732 (cond
3733 ((and 3733 ((and
3734 (eq (prolog-int-to-char key) (downcase key)) 3734 (eq (prolog-int-to-char key) (downcase key))
3735 (eq (prolog-int-to-char key) (upcase key))) 3735 (eq (prolog-int-to-char key) (upcase key)))
3736 ;; Do nothing if upper and lower case are the same 3736 ;; Do nothing if upper and lower case are the same
@@ -3767,7 +3767,7 @@ Uses the current case-table for extracting the relevant information."
3767; (setq end (+ end 1))) 3767; (setq end (+ end 1)))
3768; (if (equal (substring chars end) "") 3768; (if (equal (substring chars end) "")
3769; (substring chars 0 beg) 3769; (substring chars 0 beg)
3770; (concat (substring chars 0 beg) "-" 3770; (concat (substring chars 0 beg) "-"
3771; (prolog-regexp-dash-continuous-chars (substring chars end)))) 3771; (prolog-regexp-dash-continuous-chars (substring chars end))))
3772; ))) 3772; )))
3773 3773
@@ -3830,211 +3830,184 @@ Uses the current case-table for extracting the relevant information."
3830 "Non-nil iff the mark is set. Lobotomized version for Emacsen that do not provide their own." 3830 "Non-nil iff the mark is set. Lobotomized version for Emacsen that do not provide their own."
3831 (mark))) 3831 (mark)))
3832 3832
3833
3834;; GNU Emacs ignores `easy-menu-add' so the order in which the menus
3835;; are defined _is_ important!
3836
3837(easy-menu-define
3838 prolog-menu-help (list prolog-mode-map prolog-inferior-mode-map)
3839 "Help menu for the Prolog mode."
3840 ;; FIXME: Does it really deserve a whole menu to itself?
3841 `(,(if (featurep 'xemacs) "Help"
3842 ;; Not sure it's worth the trouble. --Stef
3843 ;; (add-to-list 'menu-bar-final-items
3844 ;; (easy-menu-intern "Prolog-Help"))
3845 "Prolog-help")
3846 ["On predicate" prolog-help-on-predicate prolog-help-function-i]
3847 ["Apropos" prolog-help-apropos (eq prolog-system 'swi)]
3848 "---"
3849 ["Describe mode" describe-mode t]))
3850
3851(easy-menu-define
3852 prolog-edit-menu-runtime prolog-mode-map
3853 "Runtime Prolog commands available from the editing buffer"
3854 ;; FIXME: Don't use a whole menu for just "Run Mercury". --Stef
3855 `("System"
3856 ;; Runtime menu name.
3857 ,@(unless (featurep 'xemacs)
3858 '(:label (cond ((eq prolog-system 'eclipse) "ECLiPSe")
3859 ((eq prolog-system 'mercury) "Mercury")
3860 (t "System"))))
3861
3862 ;; Consult items, NIL for mercury.
3863 ["Consult file" prolog-consult-file
3864 :included (not (eq prolog-system 'mercury))]
3865 ["Consult buffer" prolog-consult-buffer
3866 :included (not (eq prolog-system 'mercury))]
3867 ["Consult region" prolog-consult-region :active (region-exists-p)
3868 :included (not (eq prolog-system 'mercury))]
3869 ["Consult predicate" prolog-consult-predicate
3870 :included (not (eq prolog-system 'mercury))]
3871
3872 ;; Compile items, NIL for everything but SICSTUS.
3873 ,(if (featurep 'xemacs) "---"
3874 ["---" nil :included (eq prolog-system 'sicstus)])
3875 ["Compile file" prolog-compile-file
3876 :included (eq prolog-system 'sicstus)]
3877 ["Compile buffer" prolog-compile-buffer
3878 :included (eq prolog-system 'sicstus)]
3879 ["Compile region" prolog-compile-region :active (region-exists-p)
3880 :included (eq prolog-system 'sicstus)]
3881 ["Compile predicate" prolog-compile-predicate
3882 :included (eq prolog-system 'sicstus)]
3883
3884 ;; Debug items, NIL for Mercury.
3885 ,(if (featurep 'xemacs) "---"
3886 ["---" nil :included (not (eq prolog-system 'mercury))])
3887 ;; FIXME: Could we use toggle or radio buttons? --Stef
3888 ["Debug" prolog-debug-on :included (not (eq prolog-system 'mercury))]
3889 ["Debug off" prolog-debug-off
3890 ;; In SICStus, these are pairwise disjunctive,
3891 ;; so it's enough with a single "off"-command
3892 :included (not (memq prolog-system '(mercury sicstus)))]
3893 ["Trace" prolog-trace-on :included (not (eq prolog-system 'mercury))]
3894 ["Trace off" prolog-trace-off
3895 :included (not (memq prolog-system '(mercury sicstus)))]
3896 ["Zip" prolog-zip-on :included (and (eq prolog-system 'sicstus)
3897 (prolog-atleast-version '(3 . 7)))]
3898 ["All debug off" prolog-debug-off
3899 :included (eq prolog-system 'sicstus)]
3900 ["Source level debugging"
3901 prolog-toggle-sicstus-sd
3902 :included (and (eq prolog-system 'sicstus)
3903 (prolog-atleast-version '(3 . 7)))
3904 :style toggle
3905 :selected prolog-use-sicstus-sd]
3906
3907 "---"
3908 ["Run" run-prolog
3909 :suffix (cond ((eq prolog-system 'eclipse) "ECLiPSe")
3910 ((eq prolog-system 'mercury) "Mercury")
3911 (t "Prolog"))]))
3912
3913(easy-menu-define
3914 prolog-edit-menu-insert-move prolog-mode-map
3915 "Commands for Prolog code manipulation."
3916 '("Prolog"
3917 ["Comment region" comment-region (region-exists-p)]
3918 ["Uncomment region" prolog-uncomment-region (region-exists-p)]
3919 ["Add comment/move to comment" indent-for-comment t]
3920 ["Convert variables in region to '_'" prolog-variables-to-anonymous
3921 :active (region-exists-p) :included (not (eq prolog-system 'mercury))]
3922 "---"
3923 ["Insert predicate template" prolog-insert-predicate-template t]
3924 ["Insert next clause head" prolog-insert-next-clause t]
3925 ["Insert predicate spec" prolog-insert-predspec t]
3926 ["Insert module modeline" prolog-insert-module-modeline t]
3927 "---"
3928 ["Beginning of clause" prolog-beginning-of-clause t]
3929 ["End of clause" prolog-end-of-clause t]
3930 ["Beginning of predicate" prolog-beginning-of-predicate t]
3931 ["End of predicate" prolog-end-of-predicate t]
3932 "---"
3933 ["Indent line" prolog-indent-line t]
3934 ["Indent region" indent-region (region-exists-p)]
3935 ["Indent predicate" prolog-indent-predicate t]
3936 ["Indent buffer" prolog-indent-buffer t]
3937 ["Align region" align (region-exists-p)]
3938 "---"
3939 ["Mark clause" prolog-mark-clause t]
3940 ["Mark predicate" prolog-mark-predicate t]
3941 ["Mark paragraph" mark-paragraph t]
3942 ;;"---"
3943 ;;["Fontify buffer" font-lock-fontify-buffer t]
3944 ))
3945
3833(defun prolog-menu () 3946(defun prolog-menu ()
3834 "Create the menus for the Prolog editing buffers. 3947 "Add the menus for the Prolog editing buffers."
3835These menus are dynamically created because one may change systems
3836during the life of an Emacs session, and because GNU Emacs wants them
3837so by ignoring `easy-menu-add'."
3838
3839 ;; GNU Emacs ignores `easy-menu-add' so the order in which the menus
3840 ;; are defined _is_ important!
3841
3842 (easy-menu-define
3843 prolog-edit-menu-help (current-local-map)
3844 "Help menu for the Prolog mode."
3845 (append
3846 (if (featurep 'xemacs) '("Help") '("Prolog-help"))
3847 (cond
3848 ((eq prolog-system 'sicstus)
3849 '(["On predicate" prolog-help-on-predicate t]
3850 "---"))
3851 ((eq prolog-system 'swi)
3852 '(["On predicate" prolog-help-on-predicate t]
3853 ["Apropos" prolog-help-apropos t]
3854 "---")))
3855 '(["Describe mode" describe-mode t])))
3856
3857 (easy-menu-define
3858 prolog-edit-menu-runtime (current-local-map)
3859 "Runtime Prolog commands available from the editing buffer"
3860 (append
3861 ;; runtime menu name
3862 (list (cond ((eq prolog-system 'eclipse)
3863 "ECLiPSe")
3864 ((eq prolog-system 'mercury)
3865 "Mercury")
3866 (t
3867 "Prolog")))
3868 ;; consult items, NIL for mercury
3869 (unless (eq prolog-system 'mercury)
3870 '("---"
3871 ["Consult file" prolog-consult-file t]
3872 ["Consult buffer" prolog-consult-buffer t]
3873 ["Consult region" prolog-consult-region (region-exists-p)]
3874 ["Consult predicate" prolog-consult-predicate t]
3875 ))
3876 ;; compile items, NIL for everything but SICSTUS
3877 (when (eq prolog-system 'sicstus)
3878 '("---"
3879 ["Compile file" prolog-compile-file t]
3880 ["Compile buffer" prolog-compile-buffer t]
3881 ["Compile region" prolog-compile-region (region-exists-p)]
3882 ["Compile predicate" prolog-compile-predicate t]
3883 ))
3884 ;; debug items, NIL for mercury
3885 (cond
3886 ((eq prolog-system 'sicstus)
3887 ;; In SICStus, these are pairwise disjunctive,
3888 ;; so it's enough with one "off"-command
3889 (if (prolog-atleast-version '(3 . 7))
3890 (list "---"
3891 ["Debug" prolog-debug-on t]
3892 ["Trace" prolog-trace-on t]
3893 ["Zip" prolog-zip-on t]
3894 ["All debug off" prolog-debug-off t]
3895 '("Source level debugging"
3896 ["Enable" prolog-enable-sicstus-sd t]
3897 ["Disable" prolog-disable-sicstus-sd t]))
3898 (list "---"
3899 ["Debug" prolog-debug-on t]
3900 ["Trace" prolog-trace-on t]
3901 ["All debug off" prolog-debug-off t])))
3902 ((not (eq prolog-system 'mercury))
3903 '("---"
3904 ["Debug" prolog-debug-on t]
3905 ["Debug off" prolog-debug-off t]
3906 ["Trace" prolog-trace-on t]
3907 ["Trace off" prolog-trace-off t]))
3908 ;; default (mercury) nil
3909 )
3910 (list "---"
3911 (if (featurep 'xemacs)
3912 [(concat "Run " (cond ((eq prolog-system 'eclipse) "ECLiPSe")
3913 ((eq prolog-system 'mercury) "Mercury")
3914 (t "Prolog")))
3915 run-prolog t]
3916 ["Run Prolog" run-prolog t]))))
3917
3918 (easy-menu-define
3919 prolog-edit-menu-insert-move (current-local-map)
3920 "Commands for Prolog code manipulation."
3921 (append
3922 (list "Code"
3923 ["Comment region" comment-region (region-exists-p)]
3924 ["Uncomment region" prolog-uncomment-region (region-exists-p)]
3925 ["Add comment/move to comment" indent-for-comment t])
3926 (unless (eq prolog-system 'mercury)
3927 (list ["Convert variables in region to '_'" prolog-variables-to-anonymous (region-exists-p)]))
3928 (list "---"
3929 ["Insert predicate template" prolog-insert-predicate-template t]
3930 ["Insert next clause head" prolog-insert-next-clause t]
3931 ["Insert predicate spec" prolog-insert-predspec t]
3932 ["Insert module modeline" prolog-insert-module-modeline t]
3933 "---"
3934 ["Beginning of clause" prolog-beginning-of-clause t]
3935 ["End of clause" prolog-end-of-clause t]
3936 ["Beginning of predicate" prolog-beginning-of-predicate t]
3937 ["End of predicate" prolog-end-of-predicate t]
3938 "---"
3939 ["Indent line" prolog-indent-line t]
3940 ["Indent region" indent-region (region-exists-p)]
3941 ["Indent predicate" prolog-indent-predicate t]
3942 ["Indent buffer" prolog-indent-buffer t]
3943 ["Align region" align (region-exists-p)]
3944 "---"
3945 ["Mark clause" prolog-mark-clause t]
3946 ["Mark predicate" prolog-mark-predicate t]
3947 ["Mark paragraph" mark-paragraph t]
3948 ;"---"
3949 ;["Fontify buffer" font-lock-fontify-buffer t]
3950 )))
3951 3948
3952 (easy-menu-add prolog-edit-menu-insert-move) 3949 (easy-menu-add prolog-edit-menu-insert-move)
3953 (easy-menu-add prolog-edit-menu-runtime) 3950 (easy-menu-add prolog-edit-menu-runtime)
3954 3951
3955 ;; Add predicate index menu 3952 ;; Add predicate index menu
3956 ;(make-variable-buffer-local 'imenu-create-index-function) 3953 (set (make-local-variable 'imenu-create-index-function)
3957 (make-local-variable 'imenu-create-index-function) 3954 'imenu-default-create-index-function)
3958 (setq imenu-create-index-function 'imenu-default-create-index-function)
3959 ;;Milan (this has problems with object methods...) ###### Does it? (Stefan) 3955 ;;Milan (this has problems with object methods...) ###### Does it? (Stefan)
3960 (setq imenu-prev-index-position-function 'prolog-beginning-of-predicate) 3956 (setq imenu-prev-index-position-function 'prolog-beginning-of-predicate)
3961 (setq imenu-extract-index-name-function 'prolog-get-predspec) 3957 (setq imenu-extract-index-name-function 'prolog-get-predspec)
3962 3958
3963 (if (and prolog-imenu-flag 3959 (if (and prolog-imenu-flag
3964 (< (count-lines (point-min) (point-max)) prolog-imenu-max-lines)) 3960 (< (count-lines (point-min) (point-max)) prolog-imenu-max-lines))
3965 (imenu-add-to-menubar "Predicates")) 3961 (imenu-add-to-menubar "Predicates"))
3966 3962
3967 (easy-menu-add prolog-edit-menu-help)) 3963 (easy-menu-add prolog-menu-help))
3964
3965(easy-menu-define
3966 prolog-inferior-menu-all prolog-inferior-mode-map
3967 "Menu for the inferior Prolog buffer."
3968 `("Prolog"
3969 ;; Runtime menu name.
3970 ,@(unless (featurep 'xemacs)
3971 '(:label (cond ((eq prolog-system 'eclipse) "ECLiPSe")
3972 ((eq prolog-system 'mercury) "Mercury")
3973 (t "Prolog"))))
3974
3975 ;; Debug items, NIL for Mercury.
3976 ,(if (featurep 'xemacs) "---"
3977 ["---" nil :included (not (eq prolog-system 'mercury))])
3978 ;; FIXME: Could we use toggle or radio buttons? --Stef
3979 ["Debug" prolog-debug-on :included (not (eq prolog-system 'mercury))]
3980 ["Debug off" prolog-debug-off
3981 ;; In SICStus, these are pairwise disjunctive,
3982 ;; so it's enough with a single "off"-command
3983 :included (not (memq prolog-system '(mercury sicstus)))]
3984 ["Trace" prolog-trace-on :included (not (eq prolog-system 'mercury))]
3985 ["Trace off" prolog-trace-off
3986 :included (not (memq prolog-system '(mercury sicstus)))]
3987 ["Zip" prolog-zip-on :included (and (eq prolog-system 'sicstus)
3988 (prolog-atleast-version '(3 . 7)))]
3989 ["All debug off" prolog-debug-off
3990 :included (eq prolog-system 'sicstus)]
3991 ["Source level debugging"
3992 prolog-toggle-sicstus-sd
3993 :included (and (eq prolog-system 'sicstus)
3994 (prolog-atleast-version '(3 . 7)))
3995 :style toggle
3996 :selected prolog-use-sicstus-sd]
3997
3998 ;; Runtime.
3999 "---"
4000 ["Interrupt Prolog" comint-interrupt-subjob t]
4001 ["Quit Prolog" comint-quit-subjob t]
4002 ["Kill Prolog" comint-kill-subjob t]))
4003
3968 4004
3969(defun prolog-inferior-menu () 4005(defun prolog-inferior-menu ()
3970 "Create the menus for the Prolog inferior buffer. 4006 "Create the menus for the Prolog inferior buffer.
3971This menu is dynamically created because one may change systems during 4007This menu is dynamically created because one may change systems during
3972the life of an Emacs session." 4008the life of an Emacs session."
3973
3974 (easy-menu-define
3975 prolog-inferior-menu-help (current-local-map)
3976 "Help menu for the Prolog inferior mode."
3977 (append
3978 (if (featurep 'xemacs) '("Help") '("Prolog-help"))
3979 (cond
3980 ((eq prolog-system 'sicstus)
3981 '(["On predicate" prolog-help-on-predicate t]
3982 "---"))
3983 ((eq prolog-system 'swi)
3984 '(["On predicate" prolog-help-on-predicate t]
3985 ["Apropos" prolog-help-apropos t]
3986 "---")))
3987 '(["Describe mode" describe-mode t])))
3988
3989 (easy-menu-define
3990 prolog-inferior-menu-all (current-local-map)
3991 "Menu for the inferior Prolog buffer."
3992 (append
3993 ;; menu name
3994 (list (cond ((eq prolog-system 'eclipse)
3995 "ECLiPSe")
3996 ((eq prolog-system 'mercury)
3997 "Mercury")
3998 (t
3999 "Prolog")))
4000 ;; debug items, NIL for mercury
4001 (cond
4002 ((eq prolog-system 'sicstus)
4003 ;; In SICStus, these are pairwise disjunctive,
4004 ;; so it's enough with one "off"-command
4005 (if (prolog-atleast-version '(3 . 7))
4006 (list "---"
4007 ["Debug" prolog-debug-on t]
4008 ["Trace" prolog-trace-on t]
4009 ["Zip" prolog-zip-on t]
4010 ["All debug off" prolog-debug-off t]
4011 '("Source level debugging"
4012 ["Enable" prolog-enable-sicstus-sd t]
4013 ["Disable" prolog-disable-sicstus-sd t]))
4014 (list "---"
4015 ["Debug" prolog-debug-on t]
4016 ["Trace" prolog-trace-on t]
4017 ["All debug off" prolog-debug-off t])))
4018 ((not (eq prolog-system 'mercury))
4019 '("---"
4020 ["Debug" prolog-debug-on t]
4021 ["Debug off" prolog-debug-off t]
4022 ["Trace" prolog-trace-on t]
4023 ["Trace off" prolog-trace-off t]))
4024 ;; default (mercury) nil
4025 )
4026 ;; runtime
4027 '("---"
4028 ["Interrupt Prolog" comint-interrupt-subjob t]
4029 ["Quit Prolog" comint-quit-subjob t]
4030 ["Kill Prolog" comint-kill-subjob t])
4031 ))
4032
4033 (easy-menu-add prolog-inferior-menu-all) 4009 (easy-menu-add prolog-inferior-menu-all)
4034 (easy-menu-add prolog-inferior-menu-help)) 4010 (easy-menu-add prolog-menu-help))
4035
4036(add-hook 'prolog-mode-hook 'prolog-menu) ;FIXME.
4037(add-hook 'prolog-inferior-mode-hook 'prolog-inferior-menu) ;FIXME.
4038 4011
4039(defun prolog-mode-version () 4012(defun prolog-mode-version ()
4040 "Echo the current version of Prolog mode in the minibuffer." 4013 "Echo the current version of Prolog mode in the minibuffer."
diff --git a/lisp/recentf.el b/lisp/recentf.el
index 817434bdd55..b54a355c8f1 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -1,7 +1,7 @@
1;;; recentf.el --- setup a menu of recently opened files 1;;; recentf.el --- setup a menu of recently opened files
2 2
3;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 3;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
4;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 4;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
5 5
6;; Author: David Ponce <david@dponce.com> 6;; Author: David Ponce <david@dponce.com>
7;; Created: July 19 1999 7;; Created: July 19 1999
@@ -1355,11 +1355,7 @@ that were operated on recently."
1355 (recentf-auto-cleanup) 1355 (recentf-auto-cleanup)
1356 (let ((hook-setup (if recentf-mode 'add-hook 'remove-hook))) 1356 (let ((hook-setup (if recentf-mode 'add-hook 'remove-hook)))
1357 (dolist (hook recentf-used-hooks) 1357 (dolist (hook recentf-used-hooks)
1358 (apply hook-setup hook))) 1358 (apply hook-setup hook)))))
1359 (run-hooks 'recentf-mode-hook)
1360 (when (called-interactively-p 'interactive)
1361 (message "Recentf mode %sabled" (if recentf-mode "en" "dis"))))
1362 recentf-mode)
1363 1359
1364(defun recentf-unload-function () 1360(defun recentf-unload-function ()
1365 "Unload the recentf library." 1361 "Unload the recentf library."
diff --git a/lisp/simple.el b/lisp/simple.el
index 57ef84882d0..684d98df18e 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2341,7 +2341,11 @@ the use of a shell (with its need to quote arguments)."
2341 (error "Shell command in progress"))) 2341 (error "Shell command in progress")))
2342 (with-current-buffer buffer 2342 (with-current-buffer buffer
2343 (setq buffer-read-only nil) 2343 (setq buffer-read-only nil)
2344 (erase-buffer) 2344 ;; Setting buffer-read-only to nil doesn't suffice
2345 ;; if some text has a non-nil read-only property,
2346 ;; which comint sometimes adds for prompts.
2347 (let ((inhibit-read-only t))
2348 (erase-buffer))
2345 (display-buffer buffer) 2349 (display-buffer buffer)
2346 (setq default-directory directory) 2350 (setq default-directory directory)
2347 (setq proc (start-process "Shell" buffer shell-file-name 2351 (setq proc (start-process "Shell" buffer shell-file-name
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 7413f73ee50..dd5efd2617c 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -1,7 +1,7 @@
1;;; speedbar --- quick access to files and tags in a frame 1;;; speedbar --- quick access to files and tags in a frame
2 2
3;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 3;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4;; 2005, 2006, 2007, 2008, 2009, 2010 4;; 2005, 2006, 2007, 2008, 2009, 2010, 2011
5;; Free Software Foundation, Inc. 5;; Free Software Foundation, Inc.
6 6
7;; Author: Eric M. Ludlam <zappo@gnu.org> 7;; Author: Eric M. Ludlam <zappo@gnu.org>
@@ -515,7 +515,7 @@ hierarchy would be replaced with the new directory."
515 :type 'hook) 515 :type 'hook)
516 516
517(defcustom speedbar-mode-hook nil 517(defcustom speedbar-mode-hook nil
518 "Hooks called after creating a speedbar buffer." 518 "Hook run after creating a speedbar buffer."
519 :group 'speedbar 519 :group 'speedbar
520 :type 'hook) 520 :type 'hook)
521 521
@@ -769,99 +769,95 @@ to toggle this value.")
769(defvar speedbar-update-flag-disable nil 769(defvar speedbar-update-flag-disable nil
770 "Permanently disable changing of the update flag.") 770 "Permanently disable changing of the update flag.")
771 771
772(defvar speedbar-syntax-table nil 772(defvar speedbar-mode-syntax-table
773 (let ((st (make-syntax-table)))
774 ;; Turn off paren matching around here.
775 (modify-syntax-entry ?\' " " st)
776 (modify-syntax-entry ?\" " " st)
777 (modify-syntax-entry ?\( " " st)
778 (modify-syntax-entry ?\) " " st)
779 (modify-syntax-entry ?\{ " " st)
780 (modify-syntax-entry ?\} " " st)
781 (modify-syntax-entry ?\[ " " st)
782 (modify-syntax-entry ?\] " " st)
783 st)
773 "Syntax-table used on the speedbar.") 784 "Syntax-table used on the speedbar.")
774 785(define-obsolete-variable-alias
775(if speedbar-syntax-table 786 'speedbar-syntax-table 'speedbar-mode-syntax-table "24.1")
776 nil 787
777 (setq speedbar-syntax-table (make-syntax-table)) 788
778 ;; turn off paren matching around here. 789(defvar speedbar-mode-map
779 (modify-syntax-entry ?\' " " speedbar-syntax-table) 790 (let ((map (make-keymap)))
780 (modify-syntax-entry ?\" " " speedbar-syntax-table) 791 (suppress-keymap map t)
781 (modify-syntax-entry ?( " " speedbar-syntax-table) 792
782 (modify-syntax-entry ?) " " speedbar-syntax-table) 793 ;; Control.
783 (modify-syntax-entry ?{ " " speedbar-syntax-table) 794 (define-key map "t" 'speedbar-toggle-updates)
784 (modify-syntax-entry ?} " " speedbar-syntax-table) 795 (define-key map "g" 'speedbar-refresh)
785 (modify-syntax-entry ?[ " " speedbar-syntax-table) 796
786 (modify-syntax-entry ?] " " speedbar-syntax-table)) 797 ;; Navigation.
787 798 (define-key map "n" 'speedbar-next)
788(defvar speedbar-key-map nil 799 (define-key map "p" 'speedbar-prev)
800 (define-key map "\M-n" 'speedbar-restricted-next)
801 (define-key map "\M-p" 'speedbar-restricted-prev)
802 (define-key map "\C-\M-n" 'speedbar-forward-list)
803 (define-key map "\C-\M-p" 'speedbar-backward-list)
804 ;; These commands never seemed useful.
805 ;; (define-key map " " 'speedbar-scroll-up)
806 ;; (define-key map [delete] 'speedbar-scroll-down)
807
808 ;; Short cuts I happen to find useful.
809 (define-key map "r"
810 (lambda () (interactive)
811 (speedbar-change-initial-expansion-list
812 speedbar-previously-used-expansion-list-name)))
813 (define-key map "b"
814 (lambda () (interactive)
815 (speedbar-change-initial-expansion-list "quick buffers")))
816 (define-key map "f"
817 (lambda () (interactive)
818 (speedbar-change-initial-expansion-list "files")))
819
820 (dframe-update-keymap map)
821 map)
789 "Keymap used in speedbar buffer.") 822 "Keymap used in speedbar buffer.")
790 823(define-obsolete-variable-alias 'speedbar-key-map 'speedbar-mode-map "24.1")
791(if speedbar-key-map
792 nil
793 (setq speedbar-key-map (make-keymap))
794 (suppress-keymap speedbar-key-map t)
795
796 ;; control
797 (define-key speedbar-key-map "t" 'speedbar-toggle-updates)
798 (define-key speedbar-key-map "g" 'speedbar-refresh)
799
800 ;; navigation
801 (define-key speedbar-key-map "n" 'speedbar-next)
802 (define-key speedbar-key-map "p" 'speedbar-prev)
803 (define-key speedbar-key-map "\M-n" 'speedbar-restricted-next)
804 (define-key speedbar-key-map "\M-p" 'speedbar-restricted-prev)
805 (define-key speedbar-key-map "\C-\M-n" 'speedbar-forward-list)
806 (define-key speedbar-key-map "\C-\M-p" 'speedbar-backward-list)
807;; These commands never seemed useful.
808;; (define-key speedbar-key-map " " 'speedbar-scroll-up)
809;; (define-key speedbar-key-map [delete] 'speedbar-scroll-down)
810
811 ;; Short cuts I happen to find useful
812 (define-key speedbar-key-map "r"
813 (lambda () (interactive)
814 (speedbar-change-initial-expansion-list
815 speedbar-previously-used-expansion-list-name)))
816 (define-key speedbar-key-map "b"
817 (lambda () (interactive)
818 (speedbar-change-initial-expansion-list "quick buffers")))
819 (define-key speedbar-key-map "f"
820 (lambda () (interactive)
821 (speedbar-change-initial-expansion-list "files")))
822
823 (dframe-update-keymap speedbar-key-map)
824)
825 824
826(defun speedbar-make-specialized-keymap () 825(defun speedbar-make-specialized-keymap ()
827 "Create a keymap for use with a speedbar major or minor display mode. 826 "Create a keymap for use with a speedbar major or minor display mode.
828This basically creates a sparse keymap, and makes its parent be 827This basically creates a sparse keymap, and makes its parent be
829`speedbar-key-map'." 828`speedbar-mode-map'."
830 (let ((k (make-sparse-keymap))) 829 (let ((k (make-sparse-keymap)))
831 (set-keymap-parent k speedbar-key-map) 830 (set-keymap-parent k speedbar-mode-map)
832 k)) 831 k))
833 832
834(defvar speedbar-file-key-map nil 833(defvar speedbar-file-key-map
834 (let ((map (speedbar-make-specialized-keymap)))
835
836 ;; Basic tree features.
837 (define-key map "e" 'speedbar-edit-line)
838 (define-key map "\C-m" 'speedbar-edit-line)
839 (define-key map "+" 'speedbar-expand-line)
840 (define-key map "=" 'speedbar-expand-line)
841 (define-key map "-" 'speedbar-contract-line)
842
843 (define-key map "[" 'speedbar-expand-line-descendants)
844 (define-key map "]" 'speedbar-contract-line-descendants)
845
846 (define-key map " " 'speedbar-toggle-line-expansion)
847
848 ;; File based commands.
849 (define-key map "U" 'speedbar-up-directory)
850 (define-key map "I" 'speedbar-item-info)
851 (define-key map "B" 'speedbar-item-byte-compile)
852 (define-key map "L" 'speedbar-item-load)
853 (define-key map "C" 'speedbar-item-copy)
854 (define-key map "D" 'speedbar-item-delete)
855 (define-key map "O" 'speedbar-item-object-delete)
856 (define-key map "R" 'speedbar-item-rename)
857 (define-key map "M" 'speedbar-create-directory)
858 map)
835 "Keymap used in speedbar buffer while files are displayed.") 859 "Keymap used in speedbar buffer while files are displayed.")
836 860
837(if speedbar-file-key-map
838 nil
839 (setq speedbar-file-key-map (speedbar-make-specialized-keymap))
840
841 ;; Basic tree features
842 (define-key speedbar-file-key-map "e" 'speedbar-edit-line)
843 (define-key speedbar-file-key-map "\C-m" 'speedbar-edit-line)
844 (define-key speedbar-file-key-map "+" 'speedbar-expand-line)
845 (define-key speedbar-file-key-map "=" 'speedbar-expand-line)
846 (define-key speedbar-file-key-map "-" 'speedbar-contract-line)
847
848 (define-key speedbar-file-key-map "[" 'speedbar-expand-line-descendants)
849 (define-key speedbar-file-key-map "]" 'speedbar-contract-line-descendants)
850
851 (define-key speedbar-file-key-map " " 'speedbar-toggle-line-expansion)
852
853 ;; file based commands
854 (define-key speedbar-file-key-map "U" 'speedbar-up-directory)
855 (define-key speedbar-file-key-map "I" 'speedbar-item-info)
856 (define-key speedbar-file-key-map "B" 'speedbar-item-byte-compile)
857 (define-key speedbar-file-key-map "L" 'speedbar-item-load)
858 (define-key speedbar-file-key-map "C" 'speedbar-item-copy)
859 (define-key speedbar-file-key-map "D" 'speedbar-item-delete)
860 (define-key speedbar-file-key-map "O" 'speedbar-item-object-delete)
861 (define-key speedbar-file-key-map "R" 'speedbar-item-rename)
862 (define-key speedbar-file-key-map "M" 'speedbar-create-directory)
863 )
864
865(defvar speedbar-easymenu-definition-base 861(defvar speedbar-easymenu-definition-base
866 (append 862 (append
867 '("Speedbar" 863 '("Speedbar"
@@ -1080,7 +1076,7 @@ selected. If the speedbar frame is active, then select the attached frame."
1080Return nil if it doesn't exist." 1076Return nil if it doesn't exist."
1081 (frame-width speedbar-frame)) 1077 (frame-width speedbar-frame))
1082 1078
1083(defun speedbar-mode () 1079(define-derived-mode speedbar-mode fundamental-mode "Speedbar"
1084 "Major mode for managing a display of directories and tags. 1080 "Major mode for managing a display of directories and tags.
1085\\<speedbar-key-map> 1081\\<speedbar-key-map>
1086The first line represents the default directory of the speedbar frame. 1082The first line represents the default directory of the speedbar frame.
@@ -1120,12 +1116,7 @@ tags start with >. Click the name of the tag to go to that position
1120in the selected file. 1116in the selected file.
1121 1117
1122\\{speedbar-key-map}" 1118\\{speedbar-key-map}"
1123 ;; NOT interactive
1124 (save-excursion 1119 (save-excursion
1125 (kill-all-local-variables)
1126 (setq major-mode 'speedbar-mode)
1127 (setq mode-name "Speedbar")
1128 (set-syntax-table speedbar-syntax-table)
1129 (setq font-lock-keywords nil) ;; no font-locking please 1120 (setq font-lock-keywords nil) ;; no font-locking please
1130 (setq truncate-lines t) 1121 (setq truncate-lines t)
1131 (make-local-variable 'frame-title-format) 1122 (make-local-variable 'frame-title-format)
@@ -1138,8 +1129,7 @@ in the selected file.
1138 (setq dframe-track-mouse-function #'speedbar-track-mouse)) 1129 (setq dframe-track-mouse-function #'speedbar-track-mouse))
1139 (setq dframe-help-echo-function #'speedbar-item-info 1130 (setq dframe-help-echo-function #'speedbar-item-info
1140 dframe-mouse-click-function #'speedbar-click 1131 dframe-mouse-click-function #'speedbar-click
1141 dframe-mouse-position-function #'speedbar-position-cursor-on-line) 1132 dframe-mouse-position-function #'speedbar-position-cursor-on-line))
1142 (run-hooks 'speedbar-mode-hook))
1143 speedbar-buffer) 1133 speedbar-buffer)
1144 1134
1145(defmacro speedbar-message (fmt &rest args) 1135(defmacro speedbar-message (fmt &rest args)
diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el
index 2da5897827d..5bdd09c292b 100644
--- a/lisp/textmodes/reftex-index.el
+++ b/lisp/textmodes/reftex-index.el
@@ -1,7 +1,7 @@
1;;; reftex-index.el --- index support with RefTeX 1;;; reftex-index.el --- index support with RefTeX
2 2
3;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 3;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
4;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 4;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
5 5
6;; Author: Carsten Dominik <dominik@science.uva.nl> 6;; Author: Carsten Dominik <dominik@science.uva.nl>
7;; Maintainer: auctex-devel@gnu.org 7;; Maintainer: auctex-devel@gnu.org
@@ -275,8 +275,111 @@ will prompt for other arguments."
275 (and newtag (cdr cell) (not (member newtag (cdr cell))) 275 (and newtag (cdr cell) (not (member newtag (cdr cell)))
276 (push newtag (cdr cell))))) 276 (push newtag (cdr cell)))))
277 277
278(defvar reftex-index-map (make-sparse-keymap) 278(defvar reftex-index-mode-map
279 (let ((map (make-sparse-keymap)))
280 ;; Index map
281 (define-key map (if (featurep 'xemacs) [(button2)] [(mouse-2)])
282 'reftex-index-mouse-goto-line-and-hide)
283 (define-key map [follow-link] 'mouse-face)
284
285 (substitute-key-definition
286 'next-line 'reftex-index-next map global-map)
287 (substitute-key-definition
288 'previous-line 'reftex-index-previous map global-map)
289
290 (loop for x in
291 '(("n" . reftex-index-next)
292 ("p" . reftex-index-previous)
293 ("?" . reftex-index-show-help)
294 (" " . reftex-index-view-entry)
295 ("\C-m" . reftex-index-goto-entry-and-hide)
296 ("\C-i" . reftex-index-goto-entry)
297 ("\C-k" . reftex-index-kill)
298 ("r" . reftex-index-rescan)
299 ("R" . reftex-index-Rescan)
300 ("g" . revert-buffer)
301 ("q" . reftex-index-quit)
302 ("k" . reftex-index-quit-and-kill)
303 ("f" . reftex-index-toggle-follow)
304 ("s" . reftex-index-switch-index-tag)
305 ("e" . reftex-index-edit)
306 ("^" . reftex-index-level-up)
307 ("_" . reftex-index-level-down)
308 ("}" . reftex-index-restrict-to-section)
309 ("{" . reftex-index-widen)
310 (">" . reftex-index-restriction-forward)
311 ("<" . reftex-index-restriction-backward)
312 ("(" . reftex-index-toggle-range-beginning)
313 (")" . reftex-index-toggle-range-end)
314 ("|" . reftex-index-edit-attribute)
315 ("@" . reftex-index-edit-visual)
316 ("*" . reftex-index-edit-key)
317 ("\C-c=". reftex-index-goto-toc)
318 ("c" . reftex-index-toggle-context))
319 do (define-key map (car x) (cdr x)))
320
321 (loop for key across "0123456789" do
322 (define-key map (vector (list key)) 'digit-argument))
323 (define-key map "-" 'negative-argument)
324
325 ;; The capital letters and the exclamation mark
326 (loop for key across (concat "!" reftex-index-section-letters) do
327 (define-key map (vector (list key))
328 (list 'lambda '() '(interactive)
329 (list 'reftex-index-goto-letter key))))
330
331 (easy-menu-define reftex-index-menu map
332 "Menu for Index buffer"
333 '("Index"
334 ["Goto section A-Z"
335 (message "To go to a section, just press any of: !%s"
336 reftex-index-section-letters) t]
337 ["Show Entry" reftex-index-view-entry t]
338 ["Go To Entry" reftex-index-goto-entry t]
339 ["Exit & Go To Entry" reftex-index-goto-entry-and-hide t]
340 ["Table of Contents" reftex-index-goto-toc t]
341 ["Quit" reftex-index-quit t]
342 "--"
343 ("Update"
344 ["Rebuilt *Index* Buffer" revert-buffer t]
345 "--"
346 ["Rescan One File" reftex-index-rescan reftex-enable-partial-scans]
347 ["Rescan Entire Document" reftex-index-Rescan t])
348 ("Restrict"
349 ["Restrict to section" reftex-index-restrict-to-section t]
350 ["Widen" reftex-index-widen reftex-index-restriction-indicator]
351 ["Next Section" reftex-index-restriction-forward
352 reftex-index-restriction-indicator]
353 ["Previous Section" reftex-index-restriction-backward
354 reftex-index-restriction-indicator])
355 ("Edit"
356 ["Edit Entry" reftex-index-edit t]
357 ["Edit Key" reftex-index-edit-key t]
358 ["Edit Attribute" reftex-index-edit-attribute t]
359 ["Edit Visual" reftex-index-edit-visual t]
360 "--"
361 ["Add Parentkey" reftex-index-level-down t]
362 ["Remove Parentkey " reftex-index-level-up t]
363 "--"
364 ["Make Start-of-Range" reftex-index-toggle-range-beginning t]
365 ["Make End-of-Range" reftex-index-toggle-range-end t]
366 "--"
367 ["Kill Entry" reftex-index-kill nil]
368 "--"
369 ["Undo" reftex-index-undo nil])
370 ("Options"
371 ["Context" reftex-index-toggle-context :style toggle
372 :selected reftex-index-include-context]
373 "--"
374 ["Follow Mode" reftex-index-toggle-follow :style toggle
375 :selected reftex-index-follow-mode])
376 "--"
377 ["Help" reftex-index-show-help t]))
378
379 map)
279 "Keymap used for *Index* buffers.") 380 "Keymap used for *Index* buffers.")
381(define-obsolete-variable-alias
382 'reftex-index-map 'reftex-index-mode-map "24.1")
280 383
281(defvar reftex-index-menu) 384(defvar reftex-index-menu)
282 385
@@ -291,19 +394,14 @@ will prompt for other arguments."
291(defvar reftex-index-restriction-indicator nil) 394(defvar reftex-index-restriction-indicator nil)
292(defvar reftex-index-restriction-data nil) 395(defvar reftex-index-restriction-data nil)
293 396
294(defun reftex-index-mode () 397(define-derived-mode reftex-index-mode fundamental-mode "RefTeX Index"
295 "Major mode for managing Index buffers for LaTeX files. 398 "Major mode for managing Index buffers for LaTeX files.
296This buffer was created with RefTeX. 399This buffer was created with RefTeX.
297Press `?' for a summary of important key bindings, or check the menu. 400Press `?' for a summary of important key bindings, or check the menu.
298 401
299Here are all local bindings. 402Here are all local bindings.
300 403
301\\{reftex-index-map}" 404\\{reftex-index-mode-map}"
302 (interactive)
303 (kill-all-local-variables)
304 (setq major-mode 'reftex-index-mode
305 mode-name "RefTeX Index")
306 (use-local-map reftex-index-map)
307 (set (make-local-variable 'revert-buffer-function) 'reftex-index-revert) 405 (set (make-local-variable 'revert-buffer-function) 'reftex-index-revert)
308 (set (make-local-variable 'reftex-index-restriction-data) nil) 406 (set (make-local-variable 'reftex-index-restriction-data) nil)
309 (set (make-local-variable 'reftex-index-restriction-indicator) nil) 407 (set (make-local-variable 'reftex-index-restriction-indicator) nil)
@@ -318,10 +416,9 @@ Here are all local bindings.
318 (make-local-hook 'post-command-hook) 416 (make-local-hook 'post-command-hook)
319 (make-local-hook 'pre-command-hook)) 417 (make-local-hook 'pre-command-hook))
320 (make-local-variable 'reftex-last-follow-point) 418 (make-local-variable 'reftex-last-follow-point)
321 (easy-menu-add reftex-index-menu reftex-index-map) 419 (easy-menu-add reftex-index-menu reftex-index-mode-map)
322 (add-hook 'post-command-hook 'reftex-index-post-command-hook nil t) 420 (add-hook 'post-command-hook 'reftex-index-post-command-hook nil t)
323 (add-hook 'pre-command-hook 'reftex-index-pre-command-hook nil t) 421 (add-hook 'pre-command-hook 'reftex-index-pre-command-hook nil t))
324 (run-hooks 'reftex-index-mode-hook))
325 422
326(defconst reftex-index-help 423(defconst reftex-index-help
327" AVAILABLE KEYS IN INDEX BUFFER 424" AVAILABLE KEYS IN INDEX BUFFER
@@ -1032,57 +1129,6 @@ When index is restricted, select the previous section as restriction criterion."
1032 (setq reftex-last-follow-point 1) 1129 (setq reftex-last-follow-point 1)
1033 (and message (message "%s" message)))) 1130 (and message (message "%s" message))))
1034 1131
1035;; Index map
1036(define-key reftex-index-map (if (featurep 'xemacs) [(button2)] [(mouse-2)])
1037 'reftex-index-mouse-goto-line-and-hide)
1038(define-key reftex-index-map [follow-link] 'mouse-face)
1039
1040(substitute-key-definition
1041 'next-line 'reftex-index-next reftex-index-map global-map)
1042(substitute-key-definition
1043 'previous-line 'reftex-index-previous reftex-index-map global-map)
1044
1045(loop for x in
1046 '(("n" . reftex-index-next)
1047 ("p" . reftex-index-previous)
1048 ("?" . reftex-index-show-help)
1049 (" " . reftex-index-view-entry)
1050 ("\C-m" . reftex-index-goto-entry-and-hide)
1051 ("\C-i" . reftex-index-goto-entry)
1052 ("\C-k" . reftex-index-kill)
1053 ("r" . reftex-index-rescan)
1054 ("R" . reftex-index-Rescan)
1055 ("g" . revert-buffer)
1056 ("q" . reftex-index-quit)
1057 ("k" . reftex-index-quit-and-kill)
1058 ("f" . reftex-index-toggle-follow)
1059 ("s" . reftex-index-switch-index-tag)
1060 ("e" . reftex-index-edit)
1061 ("^" . reftex-index-level-up)
1062 ("_" . reftex-index-level-down)
1063 ("}" . reftex-index-restrict-to-section)
1064 ("{" . reftex-index-widen)
1065 (">" . reftex-index-restriction-forward)
1066 ("<" . reftex-index-restriction-backward)
1067 ("(" . reftex-index-toggle-range-beginning)
1068 (")" . reftex-index-toggle-range-end)
1069 ("|" . reftex-index-edit-attribute)
1070 ("@" . reftex-index-edit-visual)
1071 ("*" . reftex-index-edit-key)
1072 ("\C-c=". reftex-index-goto-toc)
1073 ("c" . reftex-index-toggle-context))
1074 do (define-key reftex-index-map (car x) (cdr x)))
1075
1076(loop for key across "0123456789" do
1077 (define-key reftex-index-map (vector (list key)) 'digit-argument))
1078(define-key reftex-index-map "-" 'negative-argument)
1079
1080;; The capital letters and the exclamation mark
1081(loop for key across (concat "!" reftex-index-section-letters) do
1082 (define-key reftex-index-map (vector (list key))
1083 (list 'lambda '() '(interactive)
1084 (list 'reftex-index-goto-letter key))))
1085
1086(defun reftex-index-goto-letter (char) 1132(defun reftex-index-goto-letter (char)
1087 "Go to the CHAR section in the index." 1133 "Go to the CHAR section in the index."
1088 (let ((pos (point)) 1134 (let ((pos (point))
@@ -1101,55 +1147,6 @@ When index is restricted, select the previous section as restriction criterion."
1101 (error "This <%s> index does not contain entries starting with `%c'" 1147 (error "This <%s> index does not contain entries starting with `%c'"
1102 reftex-index-tag char))))) 1148 reftex-index-tag char)))))
1103 1149
1104(easy-menu-define
1105 reftex-index-menu reftex-index-map
1106 "Menu for Index buffer"
1107 `("Index"
1108 ["Goto section A-Z"
1109 (message "To go to a section, just press any of: !%s"
1110 reftex-index-section-letters) t]
1111 ["Show Entry" reftex-index-view-entry t]
1112 ["Go To Entry" reftex-index-goto-entry t]
1113 ["Exit & Go To Entry" reftex-index-goto-entry-and-hide t]
1114 ["Table of Contents" reftex-index-goto-toc t]
1115 ["Quit" reftex-index-quit t]
1116 "--"
1117 ("Update"
1118 ["Rebuilt *Index* Buffer" revert-buffer t]
1119 "--"
1120 ["Rescan One File" reftex-index-rescan reftex-enable-partial-scans]
1121 ["Rescan Entire Document" reftex-index-Rescan t])
1122 ("Restrict"
1123 ["Restrict to section" reftex-index-restrict-to-section t]
1124 ["Widen" reftex-index-widen reftex-index-restriction-indicator]
1125 ["Next Section" reftex-index-restriction-forward
1126 reftex-index-restriction-indicator]
1127 ["Previous Section" reftex-index-restriction-backward
1128 reftex-index-restriction-indicator])
1129 ("Edit"
1130 ["Edit Entry" reftex-index-edit t]
1131 ["Edit Key" reftex-index-edit-key t]
1132 ["Edit Attribute" reftex-index-edit-attribute t]
1133 ["Edit Visual" reftex-index-edit-visual t]
1134 "--"
1135 ["Add Parentkey" reftex-index-level-down t]
1136 ["Remove Parentkey " reftex-index-level-up t]
1137 "--"
1138 ["Make Start-of-Range" reftex-index-toggle-range-beginning t]
1139 ["Make End-of-Range" reftex-index-toggle-range-end t]
1140 "--"
1141 ["Kill Entry" reftex-index-kill nil]
1142 "--"
1143 ["Undo" reftex-index-undo nil])
1144 ("Options"
1145 ["Context" reftex-index-toggle-context :style toggle
1146 :selected reftex-index-include-context]
1147 "--"
1148 ["Follow Mode" reftex-index-toggle-follow :style toggle
1149 :selected reftex-index-follow-mode])
1150 "--"
1151 ["Help" reftex-index-show-help t]))
1152
1153 1150
1154;;---------------------------------------------------------------------- 1151;;----------------------------------------------------------------------
1155;; The Index Phrases File 1152;; The Index Phrases File
@@ -1183,8 +1180,73 @@ This gets refreshed in every phrases command.")
1183 "Font lock keywords for reftex-index-phrases-mode.") 1180 "Font lock keywords for reftex-index-phrases-mode.")
1184(defvar reftex-index-phrases-font-lock-defaults nil 1181(defvar reftex-index-phrases-font-lock-defaults nil
1185 "Font lock defaults for reftex-index-phrases-mode.") 1182 "Font lock defaults for reftex-index-phrases-mode.")
1186(defvar reftex-index-phrases-map (make-sparse-keymap) 1183(defvar reftex-index-phrases-mode-map
1184 (let ((map (make-sparse-keymap)))
1185 ;; Keybindings and Menu for phrases buffer
1186 (loop for x in
1187 '(("\C-c\C-c" . reftex-index-phrases-save-and-return)
1188 ("\C-c\C-x" . reftex-index-this-phrase)
1189 ("\C-c\C-f" . reftex-index-next-phrase)
1190 ("\C-c\C-r" . reftex-index-region-phrases)
1191 ("\C-c\C-a" . reftex-index-all-phrases)
1192 ("\C-c\C-d" . reftex-index-remaining-phrases)
1193 ("\C-c\C-s" . reftex-index-sort-phrases)
1194 ("\C-c\C-n" . reftex-index-new-phrase)
1195 ("\C-c\C-m" . reftex-index-phrases-set-macro-key)
1196 ("\C-c\C-i" . reftex-index-phrases-info)
1197 ("\C-c\C-t" . reftex-index-find-next-conflict-phrase)
1198 ("\C-i" . self-insert-command))
1199 do (define-key map (car x) (cdr x)))
1200
1201 (easy-menu-define reftex-index-phrases-menu map
1202 "Menu for Phrases buffer"
1203 '("Phrases"
1204 ["New Phrase" reftex-index-new-phrase t]
1205 ["Set Phrase Macro" reftex-index-phrases-set-macro-key t]
1206 ["Recreate File Header" reftex-index-initialize-phrases-buffer t]
1207 "--"
1208 ("Sort Phrases"
1209 ["Sort" reftex-index-sort-phrases t]
1210 "--"
1211 "Sort Options"
1212 ["by Search Phrase" (setq reftex-index-phrases-sort-prefers-entry nil)
1213 :style radio :selected (not reftex-index-phrases-sort-prefers-entry)]
1214 ["by Index Entry" (setq reftex-index-phrases-sort-prefers-entry t)
1215 :style radio :selected reftex-index-phrases-sort-prefers-entry]
1216 ["in Blocks" (setq reftex-index-phrases-sort-in-blocks
1217 (not reftex-index-phrases-sort-in-blocks))
1218 :style toggle :selected reftex-index-phrases-sort-in-blocks])
1219 ["Describe Phrase" reftex-index-phrases-info t]
1220 ["Next Phrase Conflict" reftex-index-find-next-conflict-phrase t]
1221 "--"
1222 ("Find and Index in Document"
1223 ["Current Phrase" reftex-index-this-phrase t]
1224 ["Next Phrase" reftex-index-next-phrase t]
1225 ["Current and Following" reftex-index-remaining-phrases t]
1226 ["Region Phrases" reftex-index-region-phrases t]
1227 ["All Phrases" reftex-index-all-phrases t]
1228 "--"
1229 "Options"
1230 ["Match Whole Words" (setq reftex-index-phrases-search-whole-words
1231 (not reftex-index-phrases-search-whole-words))
1232 :style toggle :selected reftex-index-phrases-search-whole-words]
1233 ["Case Sensitive Search" (setq reftex-index-phrases-case-fold-search
1234 (not reftex-index-phrases-case-fold-search))
1235 :style toggle :selected (not
1236 reftex-index-phrases-case-fold-search)]
1237 ["Wrap Long Lines" (setq reftex-index-phrases-wrap-long-lines
1238 (not reftex-index-phrases-wrap-long-lines))
1239 :style toggle :selected reftex-index-phrases-wrap-long-lines]
1240 ["Skip Indexed Matches" (setq reftex-index-phrases-skip-indexed-matches
1241 (not reftex-index-phrases-skip-indexed-matches))
1242 :style toggle :selected reftex-index-phrases-skip-indexed-matches])
1243 "--"
1244 ["Save and Return" reftex-index-phrases-save-and-return t]))
1245
1246 map)
1187 "Keymap used for *toc* buffer.") 1247 "Keymap used for *toc* buffer.")
1248(define-obsolete-variable-alias
1249 'reftex-index-phrases-map 'reftex-index-phrases-mode-map "24.1")
1188 1250
1189 1251
1190(defun reftex-index-phrase-selection-or-word (arg) 1252(defun reftex-index-phrase-selection-or-word (arg)
@@ -1288,7 +1350,7 @@ If the buffer is non-empty, delete the old header first."
1288(defvar reftex-index-phrases-marker) 1350(defvar reftex-index-phrases-marker)
1289(defvar reftex-index-phrases-restrict-file nil) 1351(defvar reftex-index-phrases-restrict-file nil)
1290;;;###autoload 1352;;;###autoload
1291(defun reftex-index-phrases-mode () 1353(define-derived-mode reftex-index-phrases-mode fundamental-mode "Phrases"
1292 "Major mode for managing the Index phrases of a LaTeX document. 1354 "Major mode for managing the Index phrases of a LaTeX document.
1293This buffer was created with RefTeX. 1355This buffer was created with RefTeX.
1294 1356
@@ -1311,18 +1373,12 @@ For more information see the RefTeX User Manual.
1311 1373
1312Here are all local bindings. 1374Here are all local bindings.
1313 1375
1314\\{reftex-index-phrases-map}" 1376\\{reftex-index-phrases-mode-map}"
1315 (interactive)
1316 (kill-all-local-variables)
1317 (setq major-mode 'reftex-index-phrases-mode
1318 mode-name "Phrases")
1319 (use-local-map reftex-index-phrases-map)
1320 (set (make-local-variable 'font-lock-defaults) 1377 (set (make-local-variable 'font-lock-defaults)
1321 reftex-index-phrases-font-lock-defaults) 1378 reftex-index-phrases-font-lock-defaults)
1322 (easy-menu-add reftex-index-phrases-menu reftex-index-phrases-map) 1379 (easy-menu-add reftex-index-phrases-menu reftex-index-phrases-mode-map)
1323 (set (make-local-variable 'reftex-index-phrases-marker) (make-marker)) 1380 (set (make-local-variable 'reftex-index-phrases-marker) (make-marker)))
1324 (run-hooks 'reftex-index-phrases-mode-hook)) 1381;; (add-hook 'reftex-index-phrases-mode-hook 'turn-on-font-lock)
1325(add-hook 'reftex-index-phrases-mode-hook 'turn-on-font-lock)
1326 1382
1327;; Font Locking stuff 1383;; Font Locking stuff
1328(let ((ss (if (featurep 'xemacs) 'secondary-selection ''secondary-selection))) 1384(let ((ss (if (featurep 'xemacs) 'secondary-selection ''secondary-selection)))
@@ -2040,68 +2096,5 @@ Does not do a save-excursion."
2040 reftex-index-phrases-macro-data "\n")))) 2096 reftex-index-phrases-macro-data "\n"))))
2041 (reftex-select-with-char prompt help delay))) 2097 (reftex-select-with-char prompt help delay)))
2042 2098
2043;; Keybindings and Menu for phrases buffer
2044
2045(loop for x in
2046 '(("\C-c\C-c" . reftex-index-phrases-save-and-return)
2047 ("\C-c\C-x" . reftex-index-this-phrase)
2048 ("\C-c\C-f" . reftex-index-next-phrase)
2049 ("\C-c\C-r" . reftex-index-region-phrases)
2050 ("\C-c\C-a" . reftex-index-all-phrases)
2051 ("\C-c\C-d" . reftex-index-remaining-phrases)
2052 ("\C-c\C-s" . reftex-index-sort-phrases)
2053 ("\C-c\C-n" . reftex-index-new-phrase)
2054 ("\C-c\C-m" . reftex-index-phrases-set-macro-key)
2055 ("\C-c\C-i" . reftex-index-phrases-info)
2056 ("\C-c\C-t" . reftex-index-find-next-conflict-phrase)
2057 ("\C-i" . self-insert-command))
2058 do (define-key reftex-index-phrases-map (car x) (cdr x)))
2059
2060(easy-menu-define
2061 reftex-index-phrases-menu reftex-index-phrases-map
2062 "Menu for Phrases buffer"
2063 '("Phrases"
2064 ["New Phrase" reftex-index-new-phrase t]
2065 ["Set Phrase Macro" reftex-index-phrases-set-macro-key t]
2066 ["Recreate File Header" reftex-index-initialize-phrases-buffer t]
2067 "--"
2068 ("Sort Phrases"
2069 ["Sort" reftex-index-sort-phrases t]
2070 "--"
2071 "Sort Options"
2072 ["by Search Phrase" (setq reftex-index-phrases-sort-prefers-entry nil)
2073 :style radio :selected (not reftex-index-phrases-sort-prefers-entry)]
2074 ["by Index Entry" (setq reftex-index-phrases-sort-prefers-entry t)
2075 :style radio :selected reftex-index-phrases-sort-prefers-entry]
2076 ["in Blocks" (setq reftex-index-phrases-sort-in-blocks
2077 (not reftex-index-phrases-sort-in-blocks))
2078 :style toggle :selected reftex-index-phrases-sort-in-blocks])
2079 ["Describe Phrase" reftex-index-phrases-info t]
2080 ["Next Phrase Conflict" reftex-index-find-next-conflict-phrase t]
2081 "--"
2082 ("Find and Index in Document"
2083 ["Current Phrase" reftex-index-this-phrase t]
2084 ["Next Phrase" reftex-index-next-phrase t]
2085 ["Current and Following" reftex-index-remaining-phrases t]
2086 ["Region Phrases" reftex-index-region-phrases t]
2087 ["All Phrases" reftex-index-all-phrases t]
2088 "--"
2089 "Options"
2090 ["Match Whole Words" (setq reftex-index-phrases-search-whole-words
2091 (not reftex-index-phrases-search-whole-words))
2092 :style toggle :selected reftex-index-phrases-search-whole-words]
2093 ["Case Sensitive Search" (setq reftex-index-phrases-case-fold-search
2094 (not reftex-index-phrases-case-fold-search))
2095 :style toggle :selected (not
2096 reftex-index-phrases-case-fold-search)]
2097 ["Wrap Long Lines" (setq reftex-index-phrases-wrap-long-lines
2098 (not reftex-index-phrases-wrap-long-lines))
2099 :style toggle :selected reftex-index-phrases-wrap-long-lines]
2100 ["Skip Indexed Matches" (setq reftex-index-phrases-skip-indexed-matches
2101 (not reftex-index-phrases-skip-indexed-matches))
2102 :style toggle :selected reftex-index-phrases-skip-indexed-matches])
2103 "--"
2104 ["Save and Return" reftex-index-phrases-save-and-return t]))
2105
2106 2099
2107;;; reftex-index.el ends here 2100;;; reftex-index.el ends here
diff --git a/lisp/textmodes/reftex-sel.el b/lisp/textmodes/reftex-sel.el
index bb6531d7980..faecc1b921a 100644
--- a/lisp/textmodes/reftex-sel.el
+++ b/lisp/textmodes/reftex-sel.el
@@ -1,7 +1,7 @@
1;;; reftex-sel.el --- the selection modes for RefTeX 1;;; reftex-sel.el --- the selection modes for RefTeX
2 2
3;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 3;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
4;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 4;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
5 5
6;; Author: Carsten Dominik <dominik@science.uva.nl> 6;; Author: Carsten Dominik <dominik@science.uva.nl>
7;; Maintainer: auctex-devel@gnu.org 7;; Maintainer: auctex-devel@gnu.org
@@ -32,12 +32,81 @@
32(require 'reftex) 32(require 'reftex)
33;;; 33;;;
34 34
35(defvar reftex-select-label-map nil 35;; Common bindings in reftex-select-label-mode-map
36;; and reftex-select-bib-mode-map.
37(defvar reftex-select-shared-map
38 (let ((map (make-sparse-keymap)))
39 (substitute-key-definition
40 'next-line 'reftex-select-next map global-map)
41 (substitute-key-definition
42 'previous-line 'reftex-select-previous map global-map)
43 (substitute-key-definition
44 'keyboard-quit 'reftex-select-keyboard-quit map global-map)
45 (substitute-key-definition
46 'newline 'reftex-select-accept map global-map)
47
48 (loop for x in
49 '((" " . reftex-select-callback)
50 ("n" . reftex-select-next)
51 ([(down)] . reftex-select-next)
52 ("p" . reftex-select-previous)
53 ([(up)] . reftex-select-previous)
54 ("f" . reftex-select-toggle-follow)
55 ("\C-m" . reftex-select-accept)
56 ([(return)] . reftex-select-accept)
57 ("q" . reftex-select-quit)
58 ("." . reftex-select-show-insertion-point)
59 ("?" . reftex-select-help))
60 do (define-key map (car x) (cdr x)))
61
62 ;; The mouse-2 binding
63 (if (featurep 'xemacs)
64 (define-key map [(button2)] 'reftex-select-mouse-accept)
65 (define-key map [(mouse-2)] 'reftex-select-mouse-accept)
66 (define-key map [follow-link] 'mouse-face))
67
68
69 ;; Digit arguments
70 (loop for key across "0123456789" do
71 (define-key map (vector (list key)) 'digit-argument))
72 (define-key map "-" 'negative-argument)
73 map))
74
75(defvar reftex-select-label-mode-map
76 (let ((map (make-sparse-keymap)))
77 (set-keymap-parent map reftex-select-shared-map)
78
79 (loop for key across "aAcgFlrRstx#%" do
80 (define-key map (vector (list key))
81 (list 'lambda '()
82 "Press `?' during selection to find out about this key."
83 '(interactive) (list 'throw '(quote myexit) key))))
84
85 (loop for x in
86 '(("b" . reftex-select-jump-to-previous)
87 ("z" . reftex-select-jump)
88 ("v" . reftex-select-toggle-varioref)
89 ("V" . reftex-select-toggle-fancyref)
90 ("m" . reftex-select-mark)
91 ("u" . reftex-select-unmark)
92 ("," . reftex-select-mark-comma)
93 ("-" . reftex-select-mark-to)
94 ("+" . reftex-select-mark-and)
95 ([(tab)] . reftex-select-read-label)
96 ("\C-i" . reftex-select-read-label)
97 ("\C-c\C-n" . reftex-select-next-heading)
98 ("\C-c\C-p" . reftex-select-previous-heading))
99 do
100 (define-key map (car x) (cdr x)))
101
102 map)
36 "Keymap used for *RefTeX Select* buffer, when selecting a label. 103 "Keymap used for *RefTeX Select* buffer, when selecting a label.
37This keymap can be used to configure the label selection process which is 104This keymap can be used to configure the label selection process which is
38started with the command \\[reftex-reference].") 105started with the command \\[reftex-reference].")
106(define-obsolete-variable-alias
107 'reftex-select-label-map 'reftex-select-label-mode-map "24.1")
39 108
40(defun reftex-select-label-mode () 109(define-derived-mode reftex-select-label-mode fundamental-mode "LSelect"
41 "Major mode for selecting a label in a LaTeX document. 110 "Major mode for selecting a label in a LaTeX document.
42This buffer was created with RefTeX. 111This buffer was created with RefTeX.
43It only has a meaningful keymap when you are in the middle of a 112It only has a meaningful keymap when you are in the middle of a
@@ -47,28 +116,42 @@ Press `?' for a summary of important key bindings.
47 116
48During a selection process, these are the local bindings. 117During a selection process, these are the local bindings.
49 118
50\\{reftex-select-label-map}" 119\\{reftex-select-label-mode-map}"
51
52 (interactive)
53 (kill-all-local-variables)
54 (when (featurep 'xemacs) 120 (when (featurep 'xemacs)
55 ;; XEmacs needs the call to make-local-hook 121 ;; XEmacs needs the call to make-local-hook
56 (make-local-hook 'pre-command-hook) 122 (make-local-hook 'pre-command-hook)
57 (make-local-hook 'post-command-hook)) 123 (make-local-hook 'post-command-hook))
58 (setq major-mode 'reftex-select-label-mode
59 mode-name "LSelect")
60 (set (make-local-variable 'reftex-select-marked) nil) 124 (set (make-local-variable 'reftex-select-marked) nil)
61 (when (syntax-table-p reftex-latex-syntax-table) 125 (when (syntax-table-p reftex-latex-syntax-table)
62 (set-syntax-table reftex-latex-syntax-table)) 126 (set-syntax-table reftex-latex-syntax-table))
63 ;; We do not set a local map - reftex-select-item does this. 127 ;; We do not set a local map - reftex-select-item does this.
64 (run-hooks 'reftex-select-label-mode-hook)) 128 )
65 129
66(defvar reftex-select-bib-map nil 130(defvar reftex-select-bib-mode-map
131 (let ((map (make-sparse-keymap)))
132 (set-keymap-parent map reftex-select-shared-map)
133
134 (loop for key across "grRaAeE" do
135 (define-key map (vector (list key))
136 (list 'lambda '()
137 "Press `?' during selection to find out about this key."
138 '(interactive) (list 'throw '(quote myexit) key))))
139
140 (loop for x in
141 '(("\C-i" . reftex-select-read-cite)
142 ([(tab)] . reftex-select-read-cite)
143 ("m" . reftex-select-mark)
144 ("u" . reftex-select-unmark))
145 do (define-key map (car x) (cdr x)))
146
147 map)
67 "Keymap used for *RefTeX Select* buffer, when selecting a BibTeX entry. 148 "Keymap used for *RefTeX Select* buffer, when selecting a BibTeX entry.
68This keymap can be used to configure the BibTeX selection process which is 149This keymap can be used to configure the BibTeX selection process which is
69started with the command \\[reftex-citation].") 150started with the command \\[reftex-citation].")
151(define-obsolete-variable-alias
152 'reftex-select-bib-map 'reftex-select-bib-mode-map "24.1")
70 153
71(defun reftex-select-bib-mode () 154(define-derived-mode reftex-select-bib-mode fundamental-mode "BSelect"
72 "Major mode for selecting a citation key in a LaTeX document. 155 "Major mode for selecting a citation key in a LaTeX document.
73This buffer was created with RefTeX. 156This buffer was created with RefTeX.
74It only has a meaningful keymap when you are in the middle of a 157It only has a meaningful keymap when you are in the middle of a
@@ -78,18 +161,14 @@ Press `?' for a summary of important key bindings.
78 161
79During a selection process, these are the local bindings. 162During a selection process, these are the local bindings.
80 163
81\\{reftex-select-label-map}" 164\\{reftex-select-label-mode-map}"
82 (interactive)
83 (kill-all-local-variables)
84 (when (featurep 'xemacs) 165 (when (featurep 'xemacs)
85 ;; XEmacs needs the call to make-local-hook 166 ;; XEmacs needs the call to make-local-hook
86 (make-local-hook 'pre-command-hook) 167 (make-local-hook 'pre-command-hook)
87 (make-local-hook 'post-command-hook)) 168 (make-local-hook 'post-command-hook))
88 (setq major-mode 'reftex-select-bib-mode
89 mode-name "BSelect")
90 (set (make-local-variable 'reftex-select-marked) nil) 169 (set (make-local-variable 'reftex-select-marked) nil)
91 ;; We do not set a local map - reftex-select-item does this. 170 ;; We do not set a local map - reftex-select-item does this.
92 (run-hooks 'reftex-select-bib-mode-hook)) 171 )
93 172
94;; (defun reftex-get-offset (buf here-am-I &optional typekey toc index file) 173;; (defun reftex-get-offset (buf here-am-I &optional typekey toc index file)
95;; ;; Find the correct offset data, like insert-docstruct would, but faster. 174;; ;; Find the correct offset data, like insert-docstruct would, but faster.
@@ -657,84 +736,4 @@ Useful for large TOC's."
657 (princ help-string)) 736 (princ help-string))
658 (reftex-enlarge-to-fit "*RefTeX Help*" t)) 737 (reftex-enlarge-to-fit "*RefTeX Help*" t))
659 738
660;; Common bindings in reftex-select-label-map and reftex-select-bib-map
661(let ((map (make-sparse-keymap)))
662 (substitute-key-definition
663 'next-line 'reftex-select-next map global-map)
664 (substitute-key-definition
665 'previous-line 'reftex-select-previous map global-map)
666 (substitute-key-definition
667 'keyboard-quit 'reftex-select-keyboard-quit map global-map)
668 (substitute-key-definition
669 'newline 'reftex-select-accept map global-map)
670
671 (loop for x in
672 '((" " . reftex-select-callback)
673 ("n" . reftex-select-next)
674 ([(down)] . reftex-select-next)
675 ("p" . reftex-select-previous)
676 ([(up)] . reftex-select-previous)
677 ("f" . reftex-select-toggle-follow)
678 ("\C-m" . reftex-select-accept)
679 ([(return)] . reftex-select-accept)
680 ("q" . reftex-select-quit)
681 ("." . reftex-select-show-insertion-point)
682 ("?" . reftex-select-help))
683 do (define-key map (car x) (cdr x)))
684
685 ;; The mouse-2 binding
686 (if (featurep 'xemacs)
687 (define-key map [(button2)] 'reftex-select-mouse-accept)
688 (define-key map [(mouse-2)] 'reftex-select-mouse-accept)
689 (define-key map [follow-link] 'mouse-face))
690
691
692 ;; Digit arguments
693 (loop for key across "0123456789" do
694 (define-key map (vector (list key)) 'digit-argument))
695 (define-key map "-" 'negative-argument)
696
697 ;; Make two maps
698 (setq reftex-select-label-map map)
699 (setq reftex-select-bib-map (copy-keymap map)))
700
701;; Specific bindings in reftex-select-label-map
702(loop for key across "aAcgFlrRstx#%" do
703 (define-key reftex-select-label-map (vector (list key))
704 (list 'lambda '()
705 "Press `?' during selection to find out about this key."
706 '(interactive) (list 'throw '(quote myexit) key))))
707
708(loop for x in
709 '(("b" . reftex-select-jump-to-previous)
710 ("z" . reftex-select-jump)
711 ("v" . reftex-select-toggle-varioref)
712 ("V" . reftex-select-toggle-fancyref)
713 ("m" . reftex-select-mark)
714 ("u" . reftex-select-unmark)
715 ("," . reftex-select-mark-comma)
716 ("-" . reftex-select-mark-to)
717 ("+" . reftex-select-mark-and)
718 ([(tab)] . reftex-select-read-label)
719 ("\C-i" . reftex-select-read-label)
720 ("\C-c\C-n" . reftex-select-next-heading)
721 ("\C-c\C-p" . reftex-select-previous-heading))
722 do
723 (define-key reftex-select-label-map (car x) (cdr x)))
724
725;; Specific bindings in reftex-select-bib-map
726(loop for key across "grRaAeE" do
727 (define-key reftex-select-bib-map (vector (list key))
728 (list 'lambda '()
729 "Press `?' during selection to find out about this key."
730 '(interactive) (list 'throw '(quote myexit) key))))
731
732(loop for x in
733 '(("\C-i" . reftex-select-read-cite)
734 ([(tab)] . reftex-select-read-cite)
735 ("m" . reftex-select-mark)
736 ("u" . reftex-select-unmark))
737 do (define-key reftex-select-bib-map (car x) (cdr x)))
738
739
740;;; reftex-sel.el ends here 739;;; reftex-sel.el ends here
diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el
index 20903706a0e..a5f1e3d4f6b 100644
--- a/lisp/textmodes/reftex-toc.el
+++ b/lisp/textmodes/reftex-toc.el
@@ -1,7 +1,7 @@
1;;; reftex-toc.el --- RefTeX's table of contents mode 1;;; reftex-toc.el --- RefTeX's table of contents mode
2 2
3;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, 2006, 2007, 3;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, 2006, 2007,
4;; 2008, 2009, 2010 Free Software Foundation, Inc. 4;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
5 5
6;; Author: Carsten Dominik <dominik@science.uva.nl> 6;; Author: Carsten Dominik <dominik@science.uva.nl>
7;; Maintainer: auctex-devel@gnu.org 7;; Maintainer: auctex-devel@gnu.org
@@ -32,8 +32,98 @@
32(require 'reftex) 32(require 'reftex)
33;;; 33;;;
34 34
35(defvar reftex-toc-map (make-sparse-keymap) 35(defvar reftex-toc-mode-map
36 (let ((map (make-sparse-keymap)))
37
38 (define-key map (if (featurep 'xemacs) [(button2)] [(mouse-2)])
39 'reftex-toc-mouse-goto-line-and-hide)
40 (define-key map [follow-link] 'mouse-face)
41
42 (substitute-key-definition
43 'next-line 'reftex-toc-next map global-map)
44 (substitute-key-definition
45 'previous-line 'reftex-toc-previous map global-map)
46
47 (loop for x in
48 '(("n" . reftex-toc-next)
49 ("p" . reftex-toc-previous)
50 ("?" . reftex-toc-show-help)
51 (" " . reftex-toc-view-line)
52 ("\C-m" . reftex-toc-goto-line-and-hide)
53 ("\C-i" . reftex-toc-goto-line)
54 ("\C-c>" . reftex-toc-display-index)
55 ("r" . reftex-toc-rescan)
56 ("R" . reftex-toc-Rescan)
57 ("g" . revert-buffer)
58 ("q" . reftex-toc-quit) ;
59 ("k" . reftex-toc-quit-and-kill)
60 ("f" . reftex-toc-toggle-follow) ;
61 ("a" . reftex-toggle-auto-toc-recenter)
62 ("d" . reftex-toc-toggle-dedicated-frame)
63 ("F" . reftex-toc-toggle-file-boundary)
64 ("i" . reftex-toc-toggle-index)
65 ("l" . reftex-toc-toggle-labels)
66 ("t" . reftex-toc-max-level)
67 ("c" . reftex-toc-toggle-context)
68 ;; ("%" . reftex-toc-toggle-commented)
69 ("\M-%" . reftex-toc-rename-label)
70 ("x" . reftex-toc-external)
71 ("z" . reftex-toc-jump)
72 ("." . reftex-toc-show-calling-point)
73 ("\C-c\C-n" . reftex-toc-next-heading)
74 ("\C-c\C-p" . reftex-toc-previous-heading)
75 (">" . reftex-toc-demote)
76 ("<" . reftex-toc-promote))
77 do (define-key map (car x) (cdr x)))
78
79 (loop for key across "0123456789" do
80 (define-key map (vector (list key)) 'digit-argument))
81 (define-key map "-" 'negative-argument)
82
83 (easy-menu-define
84 reftex-toc-menu map
85 "Menu for Table of Contents buffer"
86 '("TOC"
87 ["Show Location" reftex-toc-view-line t]
88 ["Go To Location" reftex-toc-goto-line t]
89 ["Exit & Go To Location" reftex-toc-goto-line-and-hide t]
90 ["Show Calling Point" reftex-toc-show-calling-point t]
91 ["Quit" reftex-toc-quit t]
92 "--"
93 ("Edit"
94 ["Promote" reftex-toc-promote t]
95 ["Demote" reftex-toc-demote t]
96 ["Rename Label" reftex-toc-rename-label t])
97 "--"
98 ["Index" reftex-toc-display-index t]
99 ["External Document TOC " reftex-toc-external t]
100 "--"
101 ("Update"
102 ["Rebuilt *toc* Buffer" revert-buffer t]
103 ["Rescan One File" reftex-toc-rescan reftex-enable-partial-scans]
104 ["Rescan Entire Document" reftex-toc-Rescan t])
105 ("Options"
106 "TOC Items"
107 ["File Boundaries" reftex-toc-toggle-file-boundary :style toggle
108 :selected reftex-toc-include-file-boundaries]
109 ["Labels" reftex-toc-toggle-labels :style toggle
110 :selected reftex-toc-include-labels]
111 ["Index Entries" reftex-toc-toggle-index :style toggle
112 :selected reftex-toc-include-index-entries]
113 ["Context" reftex-toc-toggle-context :style toggle
114 :selected reftex-toc-include-context]
115 "--"
116 ["Follow Mode" reftex-toc-toggle-follow :style toggle
117 :selected reftex-toc-follow-mode]
118 ["Auto Recenter" reftex-toggle-auto-toc-recenter :style toggle
119 :selected reftex-toc-auto-recenter-timer]
120 ["Dedicated Frame" reftex-toc-toggle-dedicated-frame t])
121 "--"
122 ["Help" reftex-toc-show-help t]))
123
124 map)
36 "Keymap used for *toc* buffer.") 125 "Keymap used for *toc* buffer.")
126(define-obsolete-variable-alias 'reftex-toc-map 'reftex-toc-mode-map "24.1")
37 127
38(defvar reftex-toc-menu) 128(defvar reftex-toc-menu)
39(defvar reftex-last-window-height nil) 129(defvar reftex-last-window-height nil)
@@ -42,19 +132,14 @@
42(defvar reftex-toc-include-index-indicator nil) 132(defvar reftex-toc-include-index-indicator nil)
43(defvar reftex-toc-max-level-indicator nil) 133(defvar reftex-toc-max-level-indicator nil)
44 134
45(defun reftex-toc-mode () 135(define-derived-mode reftex-toc-mode fundamental-mode "TOC"
46 "Major mode for managing Table of Contents for LaTeX files. 136 "Major mode for managing Table of Contents for LaTeX files.
47This buffer was created with RefTeX. 137This buffer was created with RefTeX.
48Press `?' for a summary of important key bindings. 138Press `?' for a summary of important key bindings.
49 139
50Here are all local bindings. 140Here are all local bindings.
51 141
52\\{reftex-toc-map}" 142\\{reftex-toc-mode-map}"
53 (interactive)
54 (kill-all-local-variables)
55 (setq major-mode 'reftex-toc-mode
56 mode-name "TOC")
57 (use-local-map reftex-toc-map)
58 (set (make-local-variable 'transient-mark-mode) t) 143 (set (make-local-variable 'transient-mark-mode) t)
59 (when (featurep 'xemacs) 144 (when (featurep 'xemacs)
60 (set (make-local-variable 'zmacs-regions) t)) 145 (set (make-local-variable 'zmacs-regions) t))
@@ -79,8 +164,7 @@ Here are all local bindings.
79 (make-local-variable 'reftex-last-follow-point) 164 (make-local-variable 'reftex-last-follow-point)
80 (add-hook 'post-command-hook 'reftex-toc-post-command-hook nil t) 165 (add-hook 'post-command-hook 'reftex-toc-post-command-hook nil t)
81 (add-hook 'pre-command-hook 'reftex-toc-pre-command-hook nil t) 166 (add-hook 'pre-command-hook 'reftex-toc-pre-command-hook nil t)
82 (easy-menu-add reftex-toc-menu reftex-toc-map) 167 (easy-menu-add reftex-toc-menu reftex-toc-mode-map))
83 (run-hooks 'reftex-toc-mode-hook))
84 168
85(defvar reftex-last-toc-file nil 169(defvar reftex-last-toc-file nil
86 "Stores the file name from which `reftex-toc' was called. For redo command.") 170 "Stores the file name from which `reftex-toc' was called. For redo command.")
@@ -1006,92 +1090,4 @@ always show the current section in connection with the option
1006 (progn 1090 (progn
1007 (reftex-toggle-auto-toc-recenter)))) 1091 (reftex-toggle-auto-toc-recenter))))
1008 1092
1009;; Table of Contents map
1010(define-key reftex-toc-map (if (featurep 'xemacs) [(button2)] [(mouse-2)])
1011 'reftex-toc-mouse-goto-line-and-hide)
1012(define-key reftex-toc-map [follow-link] 'mouse-face)
1013
1014(substitute-key-definition
1015 'next-line 'reftex-toc-next reftex-toc-map global-map)
1016(substitute-key-definition
1017 'previous-line 'reftex-toc-previous reftex-toc-map global-map)
1018
1019(loop for x in
1020 '(("n" . reftex-toc-next)
1021 ("p" . reftex-toc-previous)
1022 ("?" . reftex-toc-show-help)
1023 (" " . reftex-toc-view-line)
1024 ("\C-m" . reftex-toc-goto-line-and-hide)
1025 ("\C-i" . reftex-toc-goto-line)
1026 ("\C-c>" . reftex-toc-display-index)
1027 ("r" . reftex-toc-rescan)
1028 ("R" . reftex-toc-Rescan)
1029 ("g" . revert-buffer)
1030 ("q" . reftex-toc-quit);
1031 ("k" . reftex-toc-quit-and-kill)
1032 ("f" . reftex-toc-toggle-follow);
1033 ("a" . reftex-toggle-auto-toc-recenter)
1034 ("d" . reftex-toc-toggle-dedicated-frame)
1035 ("F" . reftex-toc-toggle-file-boundary)
1036 ("i" . reftex-toc-toggle-index)
1037 ("l" . reftex-toc-toggle-labels)
1038 ("t" . reftex-toc-max-level)
1039 ("c" . reftex-toc-toggle-context)
1040; ("%" . reftex-toc-toggle-commented)
1041 ("\M-%" . reftex-toc-rename-label)
1042 ("x" . reftex-toc-external)
1043 ("z" . reftex-toc-jump)
1044 ("." . reftex-toc-show-calling-point)
1045 ("\C-c\C-n" . reftex-toc-next-heading)
1046 ("\C-c\C-p" . reftex-toc-previous-heading)
1047 (">" . reftex-toc-demote)
1048 ("<" . reftex-toc-promote))
1049 do (define-key reftex-toc-map (car x) (cdr x)))
1050
1051(loop for key across "0123456789" do
1052 (define-key reftex-toc-map (vector (list key)) 'digit-argument))
1053(define-key reftex-toc-map "-" 'negative-argument)
1054
1055(easy-menu-define
1056 reftex-toc-menu reftex-toc-map
1057 "Menu for Table of Contents buffer"
1058 '("TOC"
1059 ["Show Location" reftex-toc-view-line t]
1060 ["Go To Location" reftex-toc-goto-line t]
1061 ["Exit & Go To Location" reftex-toc-goto-line-and-hide t]
1062 ["Show Calling Point" reftex-toc-show-calling-point t]
1063 ["Quit" reftex-toc-quit t]
1064 "--"
1065 ("Edit"
1066 ["Promote" reftex-toc-promote t]
1067 ["Demote" reftex-toc-demote t]
1068 ["Rename Label" reftex-toc-rename-label t])
1069 "--"
1070 ["Index" reftex-toc-display-index t]
1071 ["External Document TOC " reftex-toc-external t]
1072 "--"
1073 ("Update"
1074 ["Rebuilt *toc* Buffer" revert-buffer t]
1075 ["Rescan One File" reftex-toc-rescan reftex-enable-partial-scans]
1076 ["Rescan Entire Document" reftex-toc-Rescan t])
1077 ("Options"
1078 "TOC Items"
1079 ["File Boundaries" reftex-toc-toggle-file-boundary :style toggle
1080 :selected reftex-toc-include-file-boundaries]
1081 ["Labels" reftex-toc-toggle-labels :style toggle
1082 :selected reftex-toc-include-labels]
1083 ["Index Entries" reftex-toc-toggle-index :style toggle
1084 :selected reftex-toc-include-index-entries]
1085 ["Context" reftex-toc-toggle-context :style toggle
1086 :selected reftex-toc-include-context]
1087 "--"
1088 ["Follow Mode" reftex-toc-toggle-follow :style toggle
1089 :selected reftex-toc-follow-mode]
1090 ["Auto Recenter" reftex-toggle-auto-toc-recenter :style toggle
1091 :selected reftex-toc-auto-recenter-timer]
1092 ["Dedicated Frame" reftex-toc-toggle-dedicated-frame t])
1093 "--"
1094 ["Help" reftex-toc-show-help t]))
1095
1096
1097;;; reftex-toc.el ends here 1093;;; reftex-toc.el ends here
diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el
index 39bd06fbd97..58778f4ce91 100644
--- a/lisp/vc/ediff-mult.el
+++ b/lisp/vc/ediff-mult.el
@@ -1,7 +1,7 @@
1;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff 1;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
2 2
3;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 3;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 4;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
5 5
6;; Author: Michael Kifer <kifer@cs.stonybrook.edu> 6;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
7;; Package: ediff 7;; Package: ediff
@@ -458,6 +458,7 @@ It is entered through one of the following commands:
458 458
459Commands: 459Commands:
460\\{ediff-meta-buffer-map}" 460\\{ediff-meta-buffer-map}"
461 ;; FIXME: Use define-derived-mode.
461 (kill-all-local-variables) 462 (kill-all-local-variables)
462 (setq major-mode 'ediff-meta-mode) 463 (setq major-mode 'ediff-meta-mode)
463 (setq mode-name "MetaEdiff") 464 (setq mode-name "MetaEdiff")
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 4eec5577e7b..5d2e07b33f1 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -1,7 +1,7 @@
1;;; ediff-util.el --- the core commands and utilities of ediff 1;;; ediff-util.el --- the core commands and utilities of ediff
2 2
3;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 3;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 4;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
5;; Free Software Foundation, Inc. 5;; Free Software Foundation, Inc.
6 6
7;; Author: Michael Kifer <kifer@cs.stonybrook.edu> 7;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
@@ -94,6 +94,7 @@ This mode is entered through one of the following commands:
94 94
95Commands: 95Commands:
96\\{ediff-mode-map}" 96\\{ediff-mode-map}"
97 ;; FIXME: Use define-derived-mode.
97 (kill-all-local-variables) 98 (kill-all-local-variables)
98 (setq major-mode 'ediff-mode) 99 (setq major-mode 'ediff-mode)
99 (setq mode-name "Ediff") 100 (setq mode-name "Ediff")
diff --git a/test/ChangeLog b/test/ChangeLog
index 695a51b7f4f..3908a734136 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
12011-01-13 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * indent/prolog.prolog: Add tokenizing tests.
4
12011-01-13 Christian Ohler <ohler@gnu.org> 52011-01-13 Christian Ohler <ohler@gnu.org>
2 6
3 * automated: New directory for automated tests. 7 * automated: New directory for automated tests.
@@ -229,7 +233,7 @@
229;; add-log-time-zone-rule: t 233;; add-log-time-zone-rule: t
230;; End: 234;; End:
231 235
232 Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. 236 Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
233 237
234 This file is part of GNU Emacs. 238 This file is part of GNU Emacs.
235 239
diff --git a/test/indent/prolog.prolog b/test/indent/prolog.prolog
index 8b96cd56a33..6cb5535fe8d 100644
--- a/test/indent/prolog.prolog
+++ b/test/indent/prolog.prolog
@@ -1,11 +1,18 @@
1%% -*- mode: prolog; coding: utf-8 -*- 1%% -*- mode: prolog; coding: utf-8; fill-column: 78 -*-
2
3%% Testing correct tokenizing.
4foo(X) :- 0'= = X.
5foo(X) :- 8'234 = X.
6foo(X) :- '\x45\' = X.
7foo(X) :- 'test 0'=X.
8foo(X) :- 'test 8'=X.
2 9
3%% wf(+E) 10%% wf(+E)
4%% Vérifie que E est une expression syntaxiquement correcte. 11%% Vérifie que E est une expression syntaxiquement correcte.
5wf(X) :- atom(X); integer(X); var(X). %Une variable ou un entier. 12wf(X) :- atom(X); integer(X); var(X). %Une variable ou un entier.
6wf(lambda(X, T, B)) :- atom(X), wf(T), wf(B). %Une fonction. 13wf(lambda(X, T, B)) :- atom(X), wf(T), wf(B). %Une fonction.
7wf(app(E1, E2)) :- wf(E1), wf(E2). %Un appel de fonction. 14wf(app(E1, E2)) :- wf(E1), wf(E2). %Un appel de fonction.
8wf(pi(X, T, B)) :- atom(X), wf(T), wf(B). %Le type d'une fonction. 15wf(pi(X, T, B)) :- atom(X), wf(T), wf(B). %Le type d'une fonction.
9 16
10%% Éléments additionnels utilisés dans le langage source. 17%% Éléments additionnels utilisés dans le langage source.
11wf(lambda(X, B)) :- atom(X), wf(B). 18wf(lambda(X, B)) :- atom(X), wf(B).
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-20 09:24:34 +0000