瀏覽代碼

Release 5.16b

Carsten Dominik 17 年之前
父節點
當前提交
293b06347f
共有 8 個文件被更改,包括 291 次插入288 次删除
  1. 1 0
      ChangeLog
  2. 33 33
      Makefile
  3. 239 239
      org
  4. 1 1
      org-install.el
  5. 11 9
      org.el
  6. 二進制
      org.pdf
  7. 6 6
      org.texi
  8. 二進制
      orgcard.pdf

+ 1 - 0
ChangeLog

@@ -1,6 +1,7 @@
 2007-12-03  Carsten Dominik  <dominik@science.uva.nl>
 
 	* org.el (org-context-choices): New constant.
+	(org-bound-and-true-p): New macro.
 
 2007-11-30  Carsten Dominik  <dominik@science.uva.nl>
 

+ 33 - 33
Makefile

@@ -43,7 +43,7 @@ MKDIR = mkdir -p
 MAKEINFO = makeinfo
 
 # How to create the HTML file
-TEXI2HTML = makeinfo --html --number-sections --no-split
+TEXI2HTML = makeinfo --html --number-sections
 
 # How to move the byte compiled files to their destination.  
 MV = mv
@@ -56,8 +56,8 @@ CP = cp -p
 ##----------------------------------------------------------------------
 
 # The following variables need to be defined by the maintainer
-LISPFILES1 = org.el org-publish.el org-mouse.el org-export-latex.el
-LISPFILES  = $(LISPFILES1) org-install.el 
+LISPFILES0 = org.el org-publish.el org-mouse.el org-export-latex.el
+LISPFILES  = $(LISPFILES0) org-install.el 
 ELCFILES   = $(LISPFILES:.el=.elc)
 DOCFILES   = org.texi org.pdf org
 CARDFILES  = orgcard.tex orgcard.pdf orgcard_letter.pdf
@@ -97,7 +97,7 @@ install-noutline: xemacs/noutline.elc
 	if [ ! -d $(lispdir) ]; then $(MKDIR) $(lispdir); else true; fi ;
 	$(CP) xemacs/noutline.el xemacs/noutline.elc $(lispdir)
 
-org-install.el: $(LISPFILES)
+org-install.el: $(LISPFILES0)
 	$(BATCH) --eval "(require 'autoload)" \
 		--eval '(find-file "org-install.el")'  \
 		--eval '(erase-buffer)' \
@@ -123,7 +123,7 @@ org.pdf: org.texi
 	$(TEXI2PDF) org.texi
 
 org.html: org.texi
-	$(TEXI2HTML) -o org.html org.texi
+	$(TEXI2HTML) --no-split -o org.html org.texi
 
 orgcard.dvi: orgcard.tex
 	tex orgcard.tex
@@ -146,6 +146,16 @@ orgcard_letter.ps: orgcard_letter.dvi
 
 # Below here are special targets for maintenance only
 
+webfiles:
+	(cd ORGWEBPAGE; emacs -batch -l ~/.emacs index.org -f org-publish-current-project)
+
+html: org.html
+
+html_split: org.texi
+	rm -rf manual
+	mkdir manual
+	$(TEXI2HTML) -o manual org.texi
+
 info:	
 	$(MAKEINFO) --no-split org.texi -o org
 
@@ -175,21 +185,21 @@ distfile:
 
 release:
 	@if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi
+	make webfiles
 	make distfile
 	make doc
-	rm -rf org-release
-	$(MKDIR) org-release
-	cp org-$(TAG).zip org-$(TAG).tar.gz org-release
-	cp org.pdf orgcard.pdf org.texi org.html org-release
-	cp ORGWEBPAGE/tmp/*.html   org-release
-	cp ORGWEBPAGE/tmp/*.el     org-release
-	cp ORGWEBPAGE/tmp/*.txt    org-release
-	cp ORGWEBPAGE/tmp/*.css    org-release
-	cp ORGWEBPAGE/tmp/*.jpg    org-release
-#	cp ORGWEBPAGE/tmp/*.tar.gz org-release
-#	cp ORGWEBPAGE/tmp/*.zip org-release
-	cp org-release/org-$(TAG).zip    org-release/org.zip
-	cp org-release/org-$(TAG).tar.gz org-release/org.tar.gz
+	make html_split
+	rm -rf RELEASEDIR
+	$(MKDIR) RELEASEDIR
+	cp org-$(TAG).zip org-$(TAG).tar.gz RELEASEDIR
+	cp org.pdf orgcard.pdf org.texi org.html RELEASEDIR
+	cp ORGWEBPAGE/tmp/*.html   RELEASEDIR
+	cp ORGWEBPAGE/tmp/*.el     RELEASEDIR
+	cp ORGWEBPAGE/tmp/*.txt    RELEASEDIR
+	cp ORGWEBPAGE/tmp/*.css    RELEASEDIR
+	cp ORGWEBPAGE/tmp/*.jpg    RELEASEDIR
+	cp RELEASEDIR/org-$(TAG).zip    RELEASEDIR/org.zip
+	cp RELEASEDIR/org-$(TAG).tar.gz RELEASEDIR/org.tar.gz
 	(cd $(HG_RELEASES); rm -rf $(DISTFILES) xemacs)
 	cp -r org-$(TAG)/* $(HG_RELEASES)
 	(cd $(HG_RELEASES); hg addremove; hg ci -m $(TAG); hg tag -f $(TAG))
@@ -200,25 +210,15 @@ trackrelease:
 	(cd $(HG_RELEASES); hg addremove; hg ci -m $(TAG); hg tag -f $(TAG))
 
 upload:
-	(cd org-release; lftp -f ../ftp_script)
+	(cd RELEASEDIR; lftp -f ../ftp_script)
+
+upload_manual:
+	 lftp -f ftp_script2
 
 relup:
 	make release
 	make upload
-
-dist:
-	make distfile TAG=$(TAG)
-	cp org-$(TAG).zip org-$(TAG).tar.gz $(HTMLDIR)
-	rm -f $(HTMLDIR)/org.zip $(HTMLDIR)/org.tar.gz
-	(cd $(HTMLDIR); ln -s org-$(TAG).zip org.zip)
-	(cd $(HTMLDIR); ln -s org-$(TAG).tar.gz org.tar.gz)
-	make doc
-	cp org.pdf orgcard.pdf org.texi org.html $(HTMLDIR)
-
-minidist:
-	rm -f org-$(TAG).zip
-	zip org-$(TAG).zip org.el
-	scp org-$(TAG).zip remote.science.uva.nl:public_html/Tools/org/
+	make upload_manual
 
 clean:
 	rm -f $(ELCFILES) org.pdf org org.html orgcard.pdf orgcard.ps

+ 239 - 239
org

@@ -61,7 +61,7 @@ This manual is for Org-mode (version 5.16a).
 * Miscellaneous::               All the rest which did not fit elsewhere
 * Extensions and Hacking::      It is possible to write add-on code
 * History and Acknowledgments::  How Org-mode came into being
-* Index::                       The fast road to specific information
+* Main Index::
 * Key Index::                   Key bindings and where they are described
 
  --- The Detailed Node Listing ---
@@ -7717,7 +7717,7 @@ properties.
      Insert a property drawer at point.
 
 
-File: org,  Node: History and Acknowledgments,  Next: Index,  Prev: Extensions and Hacking,  Up: Top
+File: org,  Node: History and Acknowledgments,  Next: Main Index,  Prev: Extensions and Hacking,  Up: Top
 
 Appendix B History and Acknowledgments
 **************************************
@@ -7888,10 +7888,10 @@ if I have forgotten someone, please accept my apologies and let me know.
      contributed various ideas and code snippets.
 
 
-File: org,  Node: Index,  Next: Key Index,  Prev: History and Acknowledgments,  Up: Top
+File: org,  Node: Main Index,  Next: Key Index,  Prev: History and Acknowledgments,  Up: Top
 
-Index
-*****
+Main Index
+**********
 
 [index]
 * Menu:
@@ -8404,7 +8404,7 @@ Index
 * XOXO export:                           XOXO export.         (line   6)
 
 
-File: org,  Node: Key Index,  Prev: Index,  Up: Top
+File: org,  Node: Key Index,  Prev: Main Index,  Up: Top
 
 Key Index
 *********
@@ -8817,238 +8817,238 @@ Key Index
 
 Tag Table:
 Node: Top971
-Node: Introduction13511
-Node: Summary13997
-Node: Installation17134
-Node: Activation18512
-Node: Feedback19749
-Node: Conventions21838
-Node: Document structure22530
-Node: Outlines23422
-Node: Headlines24087
-Ref: Headlines-Footnote-125091
-Node: Visibility cycling25202
-Ref: Visibility cycling-Footnote-127412
-Ref: Visibility cycling-Footnote-227470
-Ref: Visibility cycling-Footnote-327520
-Node: Motion27790
-Node: Structure editing28744
-Node: Archiving31992
-Node: ARCHIVE tag32550
-Node: Moving subtrees34343
-Ref: Moving subtrees-Footnote-135890
-Node: Sparse trees36334
-Ref: Sparse trees-Footnote-138606
-Ref: Sparse trees-Footnote-238788
-Node: Plain lists38903
-Ref: Plain lists-Footnote-143100
-Ref: Plain lists-Footnote-243458
-Node: Drawers43639
-Ref: Drawers-Footnote-144516
-Node: orgstruct-mode44622
-Node: Tables45522
-Node: Built-in table editor46103
-Node: Narrow columns53520
-Ref: Narrow columns-Footnote-155455
-Node: Column groups55501
-Node: orgtbl-mode57034
-Node: The spreadsheet57837
-Node: References58924
-Ref: References-Footnote-163391
-Ref: References-Footnote-263532
-Node: Formula syntax for Calc63821
-Node: Formula syntax for Lisp66278
-Node: Field formulas67996
-Node: Column formulas69304
-Node: Editing and debugging formulas70903
-Node: Updating the table75056
-Node: Advanced features76109
-Node: Hyperlinks80634
-Node: Link format81412
-Node: Internal links82705
-Ref: Internal links-Footnote-184630
-Node: Radio targets84765
-Node: External links85465
-Node: Handling links87869
-Ref: Handling links-Footnote-193185
-Ref: Handling links-Footnote-293422
-Node: Using links outside Org-mode93496
-Node: Link abbreviations94006
-Node: Search options95699
-Ref: Search options-Footnote-197479
-Node: Custom searches97560
-Node: TODO items98591
-Node: TODO basics99629
-Node: TODO extensions101844
-Node: Workflow states102788
-Ref: Workflow states-Footnote-1103963
-Node: TODO types104056
-Ref: TODO types-Footnote-1105639
-Node: Multiple sets in one file105721
-Node: Fast access to TODO states107341
-Node: Per file keywords108484
-Ref: Per file keywords-Footnote-1109786
-Node: Faces for TODO keywords109987
-Node: Progress logging110693
-Node: Closing items111124
-Ref: Closing items-Footnote-1112058
-Ref: Closing items-Footnote-2112263
-Node: Tracking TODO state changes112336
-Ref: Tracking TODO state changes-Footnote-1113521
-Node: Priorities113596
-Ref: Priorities-Footnote-1115246
-Node: Breaking down tasks115316
-Ref: Breaking down tasks-Footnote-1115836
-Node: Checkboxes115932
-Node: Tags118781
-Node: Tag inheritance119553
-Node: Setting tags120490
-Ref: Setting tags-Footnote-1125013
-Ref: Setting tags-Footnote-2125125
-Node: Tag searches125208
-Node: Properties and columns127984
-Node: Property syntax129155
-Node: Special properties131845
-Node: Property searches132916
-Node: Property inheritance134177
-Node: Column view135624
-Node: Defining columns136858
-Node: Scope of column definitions137256
-Node: Column attributes138178
-Node: Using column view140574
-Node: Capturing Column View142655
-Node: Property API144382
-Node: Dates and times144736
-Node: Time stamps145465
-Ref: Time stamps-Footnote-1147829
-Node: Creating timestamps147945
-Node: The date/time prompt150024
-Ref: The date/time prompt-Footnote-1153380
-Ref: The date/time prompt-Footnote-2153436
-Ref: The date/time prompt-Footnote-3153542
-Node: Custom time format153635
-Node: Deadlines and scheduling155327
-Ref: Deadlines and scheduling-Footnote-1157405
-Node: Inserting deadline/schedule157560
-Node: Repeated tasks158678
-Ref: Repeated tasks-Footnote-1160356
-Node: Clocking work time160477
-Ref: Clocking work time-Footnote-1165329
-Ref: Clocking work time-Footnote-2165407
-Node: Remember165533
-Node: Setting up remember166479
-Ref: Setting up remember-Footnote-1167388
-Node: Remember templates167454
-Ref: Remember templates-Footnote-1171093
-Ref: Remember templates-Footnote-2171276
-Node: Storing notes171374
-Ref: Storing notes-Footnote-1173885
-Node: Refiling notes173987
-Node: Agenda views175252
-Node: Agenda files177203
-Ref: Agenda files-Footnote-1179644
-Ref: Agenda files-Footnote-2179793
-Node: Agenda dispatcher179986
-Ref: Agenda dispatcher-Footnote-1182040
-Ref: Agenda dispatcher-Footnote-2182134
-Node: Built-in agenda views182228
-Node: Weekly/Daily agenda182810
-Ref: Weekly/Daily agenda-Footnote-1186108
-Node: Global TODO list186312
-Node: Matching tags and properties188592
-Node: Timeline189683
-Node: Stuck projects190357
-Node: Presentation and sorting192210
-Node: Categories193003
-Ref: Categories-Footnote-1193714
-Node: Time-of-day specifications194151
-Node: Sorting of agenda items196124
-Node: Agenda commands197408
-Node: Custom agenda views204871
-Node: Storing searches205592
-Ref: Storing searches-Footnote-1208126
-Node: Block agenda208243
-Node: Setting Options209475
-Node: Exporting Agenda Views212216
-Ref: Exporting Agenda Views-Footnote-1216573
-Ref: Exporting Agenda Views-Footnote-2216630
-Node: Extracting Agenda Information for other programs216816
-Node: Embedded LaTeX220944
-Ref: Embedded LaTeX-Footnote-1222038
-Node: Math symbols222228
-Node: Subscripts and Superscripts222995
-Node: LaTeX fragments223841
-Ref: LaTeX fragments-Footnote-1226074
-Ref: LaTeX fragments-Footnote-2226335
-Node: Processing LaTeX fragments226469
-Node: CDLaTeX mode227417
-Ref: CDLaTeX mode-Footnote-1229903
-Node: Exporting230051
-Node: ASCII export231518
-Node: HTML export233019
-Node: HTML Export commands233645
-Node: Quoting HTML tags235432
-Node: Links236067
-Node: Images236764
-Ref: Images-Footnote-1237635
-Node: CSS support237696
-Ref: CSS support-Footnote-1239015
-Node: LaTeX export239128
-Node: LaTeX export commands239477
-Node: Quoting LaTeX code240639
-Node: Sectioning structure241173
-Node: XOXO export241674
-Node: iCalendar export242114
-Node: Text interpretation243583
-Node: Comment lines244238
-Node: Initial text244633
-Node: Footnotes246302
-Node: Quoted examples247094
-Node: Enhancing text247869
-Node: Export options250318
-Node: Publishing252779
-Ref: Publishing-Footnote-1253740
-Ref: Publishing-Footnote-2253884
-Node: Configuration254035
-Node: Project alist254753
-Node: Sources and destinations255819
-Node: Selecting files256549
-Node: Publishing action257297
-Node: Publishing options258631
-Node: Publishing links261137
-Node: Project page index262652
-Node: Sample configuration263430
-Node: Simple example263922
-Node: Complex example264595
-Node: Triggering publication266671
-Node: Miscellaneous267356
-Node: Completion267990
-Node: Customization269660
-Node: In-buffer settings270243
-Node: The very busy C-c C-c key275913
-Node: Clean view277768
-Node: TTY keys280345
-Node: Interaction281955
-Node: Cooperation282352
-Node: Conflicts286023
-Node: Bugs288033
-Node: Extensions and Hacking289529
-Node: Extensions290254
-Node: Adding hyperlink types292516
-Node: Tables in arbitrary syntax296178
-Node: Radio tables297570
-Node: A LaTeX example300073
-Ref: A LaTeX example-Footnote-1303751
-Ref: A LaTeX example-Footnote-2303899
-Node: Translator functions304334
-Ref: Translator functions-Footnote-1307463
-Node: Radio lists307551
-Ref: Radio lists-Footnote-1308673
-Node: Dynamic blocks308793
-Node: Special agenda views310765
-Node: Using the property API314010
-Node: History and Acknowledgments315608
-Node: Index322289
-Node: Key Index359005
+Node: Introduction13456
+Node: Summary13942
+Node: Installation17079
+Node: Activation18457
+Node: Feedback19694
+Node: Conventions21783
+Node: Document structure22475
+Node: Outlines23367
+Node: Headlines24032
+Ref: Headlines-Footnote-125036
+Node: Visibility cycling25147
+Ref: Visibility cycling-Footnote-127357
+Ref: Visibility cycling-Footnote-227415
+Ref: Visibility cycling-Footnote-327465
+Node: Motion27735
+Node: Structure editing28689
+Node: Archiving31937
+Node: ARCHIVE tag32495
+Node: Moving subtrees34288
+Ref: Moving subtrees-Footnote-135835
+Node: Sparse trees36279
+Ref: Sparse trees-Footnote-138551
+Ref: Sparse trees-Footnote-238733
+Node: Plain lists38848
+Ref: Plain lists-Footnote-143045
+Ref: Plain lists-Footnote-243403
+Node: Drawers43584
+Ref: Drawers-Footnote-144461
+Node: orgstruct-mode44567
+Node: Tables45467
+Node: Built-in table editor46048
+Node: Narrow columns53465
+Ref: Narrow columns-Footnote-155400
+Node: Column groups55446
+Node: orgtbl-mode56979
+Node: The spreadsheet57782
+Node: References58869
+Ref: References-Footnote-163336
+Ref: References-Footnote-263477
+Node: Formula syntax for Calc63766
+Node: Formula syntax for Lisp66223
+Node: Field formulas67941
+Node: Column formulas69249
+Node: Editing and debugging formulas70848
+Node: Updating the table75001
+Node: Advanced features76054
+Node: Hyperlinks80579
+Node: Link format81357
+Node: Internal links82650
+Ref: Internal links-Footnote-184575
+Node: Radio targets84710
+Node: External links85410
+Node: Handling links87814
+Ref: Handling links-Footnote-193130
+Ref: Handling links-Footnote-293367
+Node: Using links outside Org-mode93441
+Node: Link abbreviations93951
+Node: Search options95644
+Ref: Search options-Footnote-197424
+Node: Custom searches97505
+Node: TODO items98536
+Node: TODO basics99574
+Node: TODO extensions101789
+Node: Workflow states102733
+Ref: Workflow states-Footnote-1103908
+Node: TODO types104001
+Ref: TODO types-Footnote-1105584
+Node: Multiple sets in one file105666
+Node: Fast access to TODO states107286
+Node: Per file keywords108429
+Ref: Per file keywords-Footnote-1109731
+Node: Faces for TODO keywords109932
+Node: Progress logging110638
+Node: Closing items111069
+Ref: Closing items-Footnote-1112003
+Ref: Closing items-Footnote-2112208
+Node: Tracking TODO state changes112281
+Ref: Tracking TODO state changes-Footnote-1113466
+Node: Priorities113541
+Ref: Priorities-Footnote-1115191
+Node: Breaking down tasks115261
+Ref: Breaking down tasks-Footnote-1115781
+Node: Checkboxes115877
+Node: Tags118726
+Node: Tag inheritance119498
+Node: Setting tags120435
+Ref: Setting tags-Footnote-1124958
+Ref: Setting tags-Footnote-2125070
+Node: Tag searches125153
+Node: Properties and columns127929
+Node: Property syntax129100
+Node: Special properties131790
+Node: Property searches132861
+Node: Property inheritance134122
+Node: Column view135569
+Node: Defining columns136803
+Node: Scope of column definitions137201
+Node: Column attributes138123
+Node: Using column view140519
+Node: Capturing Column View142600
+Node: Property API144327
+Node: Dates and times144681
+Node: Time stamps145410
+Ref: Time stamps-Footnote-1147774
+Node: Creating timestamps147890
+Node: The date/time prompt149969
+Ref: The date/time prompt-Footnote-1153325
+Ref: The date/time prompt-Footnote-2153381
+Ref: The date/time prompt-Footnote-3153487
+Node: Custom time format153580
+Node: Deadlines and scheduling155272
+Ref: Deadlines and scheduling-Footnote-1157350
+Node: Inserting deadline/schedule157505
+Node: Repeated tasks158623
+Ref: Repeated tasks-Footnote-1160301
+Node: Clocking work time160422
+Ref: Clocking work time-Footnote-1165274
+Ref: Clocking work time-Footnote-2165352
+Node: Remember165478
+Node: Setting up remember166424
+Ref: Setting up remember-Footnote-1167333
+Node: Remember templates167399
+Ref: Remember templates-Footnote-1171038
+Ref: Remember templates-Footnote-2171221
+Node: Storing notes171319
+Ref: Storing notes-Footnote-1173830
+Node: Refiling notes173932
+Node: Agenda views175197
+Node: Agenda files177148
+Ref: Agenda files-Footnote-1179589
+Ref: Agenda files-Footnote-2179738
+Node: Agenda dispatcher179931
+Ref: Agenda dispatcher-Footnote-1181985
+Ref: Agenda dispatcher-Footnote-2182079
+Node: Built-in agenda views182173
+Node: Weekly/Daily agenda182755
+Ref: Weekly/Daily agenda-Footnote-1186053
+Node: Global TODO list186257
+Node: Matching tags and properties188537
+Node: Timeline189628
+Node: Stuck projects190302
+Node: Presentation and sorting192155
+Node: Categories192948
+Ref: Categories-Footnote-1193659
+Node: Time-of-day specifications194096
+Node: Sorting of agenda items196069
+Node: Agenda commands197353
+Node: Custom agenda views204816
+Node: Storing searches205537
+Ref: Storing searches-Footnote-1208071
+Node: Block agenda208188
+Node: Setting Options209420
+Node: Exporting Agenda Views212161
+Ref: Exporting Agenda Views-Footnote-1216518
+Ref: Exporting Agenda Views-Footnote-2216575
+Node: Extracting Agenda Information for other programs216761
+Node: Embedded LaTeX220889
+Ref: Embedded LaTeX-Footnote-1221983
+Node: Math symbols222173
+Node: Subscripts and Superscripts222940
+Node: LaTeX fragments223786
+Ref: LaTeX fragments-Footnote-1226019
+Ref: LaTeX fragments-Footnote-2226280
+Node: Processing LaTeX fragments226414
+Node: CDLaTeX mode227362
+Ref: CDLaTeX mode-Footnote-1229848
+Node: Exporting229996
+Node: ASCII export231463
+Node: HTML export232964
+Node: HTML Export commands233590
+Node: Quoting HTML tags235377
+Node: Links236012
+Node: Images236709
+Ref: Images-Footnote-1237580
+Node: CSS support237641
+Ref: CSS support-Footnote-1238960
+Node: LaTeX export239073
+Node: LaTeX export commands239422
+Node: Quoting LaTeX code240584
+Node: Sectioning structure241118
+Node: XOXO export241619
+Node: iCalendar export242059
+Node: Text interpretation243528
+Node: Comment lines244183
+Node: Initial text244578
+Node: Footnotes246247
+Node: Quoted examples247039
+Node: Enhancing text247814
+Node: Export options250263
+Node: Publishing252724
+Ref: Publishing-Footnote-1253685
+Ref: Publishing-Footnote-2253829
+Node: Configuration253980
+Node: Project alist254698
+Node: Sources and destinations255764
+Node: Selecting files256494
+Node: Publishing action257242
+Node: Publishing options258576
+Node: Publishing links261082
+Node: Project page index262597
+Node: Sample configuration263375
+Node: Simple example263867
+Node: Complex example264540
+Node: Triggering publication266616
+Node: Miscellaneous267301
+Node: Completion267935
+Node: Customization269605
+Node: In-buffer settings270188
+Node: The very busy C-c C-c key275858
+Node: Clean view277713
+Node: TTY keys280290
+Node: Interaction281900
+Node: Cooperation282297
+Node: Conflicts285968
+Node: Bugs287978
+Node: Extensions and Hacking289474
+Node: Extensions290199
+Node: Adding hyperlink types292461
+Node: Tables in arbitrary syntax296123
+Node: Radio tables297515
+Node: A LaTeX example300018
+Ref: A LaTeX example-Footnote-1303696
+Ref: A LaTeX example-Footnote-2303844
+Node: Translator functions304279
+Ref: Translator functions-Footnote-1307408
+Node: Radio lists307496
+Ref: Radio lists-Footnote-1308618
+Node: Dynamic blocks308738
+Node: Special agenda views310710
+Node: Using the property API313955
+Node: History and Acknowledgments315553
+Node: Main Index322239
+Node: Key Index358970
 
 End Tag Table

+ 1 - 1
org-install.el

@@ -8,7 +8,7 @@
 ;;;;;;  org-remember-insinuate org-open-at-point-global org-insert-link-global
 ;;;;;;  org-store-link orgtbl-mode turn-on-orgtbl org-run-like-in-org-mode
 ;;;;;;  turn-on-orgstruct++ turn-on-orgstruct orgstruct-mode org-global-cycle
-;;;;;;  org-cycle org-mode) "org" "org.el" (18260 2234))
+;;;;;;  org-cycle org-mode) "org" "org.el" (18260 13209))
 ;;; Generated autoloads from org.el
 
 (autoload (quote org-mode) "org" "\

+ 11 - 9
org.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 5.16a
+;; Version: 5.16b
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -98,6 +98,10 @@
     (get-text-property 0 'test (format "%s" x)))
   "Does format transport text properties?")
 
+(defmacro org-bound-and-true-p (var)
+  "Return the value of symbol VAR if it is bound, else nil."
+  `(and (boundp (quote ,var)) ,var))
+
 (defmacro org-unmodified (&rest body)
   "Execute body without changing buffer-modified-p."
   `(set-buffer-modified-p
@@ -13069,14 +13073,12 @@ to be run from that hook to function properly."
 		       (nth 1 entry)
 		     org-default-notes-file))
 	     (headline (nth 2 entry))
-	     (v-c (if (or (and (eq window-system 'x)
-			       (x-cut-buffer-or-selection-value))
-			  (bound-and-true-p 'x-last-selected-text)
-			  (bound-and-true-p 'x-last-selected-text-primary))
-		      x-last-selected-text-primary
-		    (if (> (length kill-ring) 0)
-			(current-kill 0)
-		      nil)))
+	     (v-c (or (and (eq window-system 'x)
+			   (fboundp 'x-cut-buffer-or-selection-value)
+			   (x-cut-buffer-or-selection-value))
+		      (org-bound-and-true-p x-last-selected-text)
+		      (org-bound-and-true-p x-last-selected-text-primary)
+		      (and (> (length kill-ring) 0) (current-kill 0))))
 	     (v-t (format-time-string (car org-time-stamp-formats) (org-current-time)))
 	     (v-T (format-time-string (cdr org-time-stamp-formats) (org-current-time)))
 	     (v-u (concat "[" (substring v-t 1 -1) "]"))

二進制
org.pdf


+ 6 - 6
org.texi

@@ -1,4 +1,4 @@
-]\input texinfo
+\input texinfo
 @c %**start of header
 @setfilename ../../info/org
 @settitle Org Mode Manual
@@ -91,7 +91,7 @@ Software Foundation raise funds for GNU development.''
 * Miscellaneous::               All the rest which did not fit elsewhere
 * Extensions and Hacking::      It is possible to write add-on code
 * History and Acknowledgments::  How Org-mode came into being 
-* Index::                       The fast road to specific information
+* Main Index::                  
 * Key Index::                   Key bindings and where they are described
 
 @detailmenu
@@ -8357,7 +8357,7 @@ Get all property keys in the current buffer.
 Insert a property drawer at point.
 @end defun
 
-@node History and Acknowledgments, Index, Extensions and Hacking, Top
+@node History and Acknowledgments, Main Index, Extensions and Hacking, Top
 @appendix History and Acknowledgments
 @cindex acknowledgments
 @cindex history
@@ -8532,12 +8532,12 @@ and contributed various ideas and code snippets.
 @end itemize
 
 
-@node Index, Key Index, History and Acknowledgments, Top
-@unnumbered Index
+@node Main Index, Key Index, History and Acknowledgments, Top
+@unnumbered Main Index
 
 @printindex cp
 
-@node Key Index,  , Index, Top
+@node Key Index,  , Main Index, Top
 @unnumbered Key Index
 
 @printindex ky

二進制
orgcard.pdf