Просмотр исходного кода

Keep compiler happy and fix some ChangeLog issues

This is in preparation for the next sync with Emacs.
Carsten Dominik 15 лет назад
Родитель
Сommit
c54a49b7cc
3 измененных файлов с 26 добавлено и 12 удалено
  1. 1 1
      ORGWEBPAGE/Changes.org
  2. 23 10
      lisp/ChangeLog
  3. 2 1
      lisp/org-compat.el

+ 1 - 1
ORGWEBPAGE/Changes.org

@@ -77,7 +77,7 @@ This was necessary to free up the =f= key, see above.
 **** The agenda can be put into a dedicated frame
 
 When the variable =org-agenda-window-setup= has the value
-=separate-frame=, then the new frame created to show the agenda
+=other-frame=, then the new frame created to show the agenda
 will now have the window marked as /dedicated/.  As a
 consequence, exiting the agenda while the agenda is the only
 window on the frame will kill that frame.

+ 23 - 10
lisp/ChangeLog

@@ -1,18 +1,15 @@
 2009-09-02  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-compat.el (w32-focus-frame): Declare the w32-focus-frame
+	function.
+
 	* org-exp.el (org-get-file-contents): Only protect lines that
 	really need it.
 
-	* org-html.el (require): require cl for compilation.
+	* org-html.el (require): Require cl for compilation.
 
 	* org.el:  Avoid using `default-major-mode'.
 
-	* org-html.el (org-export-as-html):  Avoid using
-	`default-major-mode'.
-
-	* org-docbook.el (org-export-as-docbook): Avoid using
-	`default-major-mode'.
-
 	* org-plot.el (require): Require CL only at compile time.
 
 	* org-exp.el (require): Require CL only at compile time.
@@ -42,8 +39,8 @@
 	* org-latex.el (org-export-latex-protect-amp): New function.
 	(org-export-latex-links): Protect link ampersands in tables.
 
-	* org-exp.el (org-export-select-backend-specific-text): Match in 2
-	steps, to avoid regexp problems.
+	* org-exp.el (org-export-select-backend-specific-text): Match in
+	two steps, to avoid regexp problems.
 
 	* org.el (org-offer-links-in-entry): Improve working with many and
 	duplicate links.
@@ -167,7 +164,7 @@
 	(org-agenda-get-some-entry-text, org-agenda-redo): Don't use
 	`goto-line'.
 
-2009-08-26  Bernt Hansen  <bernt@norang.ca>  (tiny change)
+2009-08-26  Bernt Hansen  <bernt@norang.ca>
 
 	* org-clock.el (org-notify): Bugfix.
 
@@ -382,6 +379,22 @@
 	* org-remember.el (org-remember-finalize): Avoid buffer-modified
 	messages.
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 2009-08-05  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-latex.el (org-export-latex-first-lines): Fix bug with

+ 2 - 1
lisp/org-compat.el

@@ -36,7 +36,8 @@
 
 (require 'org-macs)
 
-(declare-function find-library-name             "find-func"  (library))
+(declare-function find-library-name "find-func"  (library))
+(declare-function w32-focus-frame   "w32-win" (frame))
 
 (defconst org-xemacs-p (featurep 'xemacs)) ; not used by org.el itself
 (defconst org-format-transports-properties-p