Mercurial > emacs

--- a/lisp/ChangeLog	Sat Oct 20 23:55:30 2007 +0000
+++ b/lisp/ChangeLog	Sun Oct 21 00:24:32 2007 +0000
@@ -1,3 +1,37 @@
+2007-10-21  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* textmodes/reftex.el: Move require easymenu before first use.
+	(reftex-info): Require info at compile too.
+
+	* textmodes/org-publish.el (org-publish-org-to-html)
+	(org-publish-org-to): Require org at compile time too.
+	(org-publish-attachment): Require at compile time too.
+
+	* term/tty-colors.el (w32-tty-standard-colors): Pacify
+	byte-compiler.
+
+	* term/pc-win.el (frame-creation-function-alist): Add to this
+	instead of setting frame-creation-function.
+
+	* play/blackbox.el (bb-up, bb-down): Use forward-line.
+
+	* net/rcirc.el (rcirc-markup-text-functions): Move definition
+	earlier.
+
+	* calendar/todo-mode.el: Require calendar at compile time.
+
+	* calendar/cal-islam.el: Require diary-lib at compile time.
+
+	* calendar/cal-hebrew.el: Require diary-lib and holidays at
+	compile time.
+
+	* w32-vars.el: Provide w32-vars.
+
+	* term/w32-win.el: Require w32-vars.
+	(w32-color-map): Pacify byte-compiler.
+
+	* loadup.el: Load w32-wars before term/w32-win.
+
 2007-10-20  Juri Linkov  <juri@jurta.org>

 	* textmodes/fill.el (fill-paragraph): When the region is active,
--- a/lisp/calendar/cal-hebrew.el	Sat Oct 20 23:55:30 2007 +0000
+++ b/lisp/calendar/cal-hebrew.el	Sun Oct 21 00:24:32 2007 +0000
@@ -45,6 +45,9 @@
 (defvar original-date)

 (require 'calendar)
+(eval-when-compile
+  (require 'diary-lib)
+  (require 'holidays))

 (defun hebrew-calendar-leap-year-p (year)
   "t if YEAR is a Hebrew calendar leap year."
--- a/lisp/calendar/cal-islam.el	Sat Oct 20 23:55:30 2007 +0000
+++ b/lisp/calendar/cal-islam.el	Sun Oct 21 00:24:32 2007 +0000
@@ -43,6 +43,7 @@
 (defvar original-date)

 (require 'cal-julian)
+(eval-when-compile (require 'diary-lib))

 (defvar calendar-islamic-month-name-array
   ["Muharram" "Safar" "Rabi I" "Rabi II" "Jumada I" "Jumada II"
--- a/lisp/calendar/todo-mode.el	Sat Oct 20 23:55:30 2007 +0000
+++ b/lisp/calendar/todo-mode.el	Sun Oct 21 00:24:32 2007 +0000
@@ -914,7 +914,8 @@

 (eval-when-compile
   (defvar date)
-  (defvar entry))
+  (defvar entry)
+  (require 'calendar))

 ;; Read about this function in the setup instructions above!
 ;;;###autoload
--- a/lisp/loadup.el	Sat Oct 20 23:55:30 2007 +0000
+++ b/lisp/loadup.el	Sun Oct 21 00:24:32 2007 +0000
@@ -194,11 +194,11 @@
     (progn
       (load "international/ccl")
       (load "international/code-pages")
+      (load "w32-vars")
       (load "term/w32-win")
       (load "ls-lisp")
       (load "disp-table") ; needed to setup ibm-pc char set, see internal.el
       (load "dos-w32")
-      (load "w32-vars")
       (load "w32-fns")))
 (if (eq system-type 'ms-dos)
     (progn
--- a/lisp/net/rcirc.el	Sat Oct 20 23:55:30 2007 +0000
+++ b/lisp/net/rcirc.el	Sun Oct 21 00:24:32 2007 +0000
@@ -1281,6 +1281,20 @@
   :type 'boolean
   :group 'rcirc)

+(defvar rcirc-markup-text-functions
+  '(rcirc-markup-attributes
+    rcirc-markup-my-nick
+    rcirc-markup-urls
+    rcirc-markup-keywords
+    rcirc-markup-bright-nicks
+    rcirc-markup-fill)
+
+  "List of functions used to manipulate text before it is printed.
+
+Each function takes two arguments, SENDER, RESPONSE.  The buffer
+is narrowed with the text to be printed and the point is at the
+beginning of the `rcirc-text' propertized text.")
+
 (defun rcirc-print (process sender response target text &optional activity)
   "Print TEXT in the buffer associated with TARGET.
 Format based on SENDER and RESPONSE.  If ACTIVITY is non-nil,
@@ -2083,20 +2097,6 @@
       (rcirc-browse-url-at-point (posn-point position)))))


-(defvar rcirc-markup-text-functions
-  '(rcirc-markup-attributes
-    rcirc-markup-my-nick
-    rcirc-markup-urls
-    rcirc-markup-keywords
-    rcirc-markup-bright-nicks
-    rcirc-markup-fill)
-
-  "List of functions used to manipulate text before it is printed.
-
-Each function takes two arguments, SENDER, RESPONSE.  The buffer
-is narrowed with the text to be printed and the point is at the
-beginning of the `rcirc-text' propertized text.")
-
 (defun rcirc-markup-timestamp (sender response)
   (goto-char (point-min))
   (insert (rcirc-facify (format-time-string rcirc-time-format)
--- a/lisp/play/blackbox.el	Sat Oct 20 23:55:30 2007 +0000
+++ b/lisp/play/blackbox.el	Sun Oct 21 00:24:32 2007 +0000
@@ -296,14 +296,14 @@
 (defun bb-up (count)
   (interactive "p")
   (while (and (> count 0) (> bb-y -1))
-    (previous-line 1)
+    (forward-line -1)
     (setq bb-y (1- bb-y))
     (setq count (1- count))))

 (defun bb-down (count)
   (interactive "p")
   (while (and (> count 0) (< bb-y 8))
-    (next-line 1)
+    (forward-line 1)
     (setq bb-y (1+ bb-y))
     (setq count (1- count))))
--- a/lisp/term/pc-win.el	Sat Oct 20 23:55:30 2007 +0000
+++ b/lisp/term/pc-win.el	Sun Oct 21 00:24:32 2007 +0000
@@ -130,7 +130,7 @@
       (unless success (delete-frame frame)))
     frame))

-(setq frame-creation-function 'make-msdos-frame)
+(add-to-list 'frame-creation-function-alist '(pc . make-msdos-frame))

 ;; ---------------------------------------------------------------------------
 ;; More or less useful imitations of certain X-functions.  A lot of the
--- a/lisp/term/tty-colors.el	Sat Oct 20 23:55:30 2007 +0000
+++ b/lisp/term/tty-colors.el	Sun Oct 21 00:24:32 2007 +0000
@@ -63,6 +63,7 @@
 ;;; Code:

 (defvar msdos-color-values)
+(defvar w32-tty-standard-colors)

 ;; The following list is taken from rgb.txt distributed with X.
 ;;
--- a/lisp/term/w32-win.el	Sat Oct 20 23:55:30 2007 +0000
+++ b/lisp/term/w32-win.el	Sun Oct 21 00:24:32 2007 +0000
@@ -79,12 +79,14 @@
 (require 'menu-bar)
 (require 'dnd)
 (require 'code-pages)
+(require 'w32-vars)

 ;; Keep an obsolete alias for w32-focus-frame in case it is used by code
 ;; outside Emacs.
 (define-obsolete-function-alias 'w32-focus-frame 'x-focus-frame "23.1")

 (defvar xlfd-regexp-registry-subnum)
+(defvar w32-color-map) ;; defined in w32fns.c

 ;; Conditional on new-fontset so bootstrapping works on non-GUI compiles
 (if (fboundp 'new-fontset)
--- a/lisp/textmodes/org-publish.el	Sat Oct 20 23:55:30 2007 +0000
+++ b/lisp/textmodes/org-publish.el	Sun Oct 21 00:24:32 2007 +0000
@@ -443,7 +443,7 @@
   "Publish an org file to HTML.
 PLIST is the property list for the given project.
 FILENAME is the filename of the org file to be published."
-  (require 'org)
+  (eval-and-compile (require 'org))
   (let* ((arg (plist-get plist :headline-levels)))
     (progn
       (find-file filename)
@@ -464,7 +464,7 @@
   "Publish an org file to FORMAT.
 PLIST is the property list for the given project.
 FILENAME is the filename of the org file to be published."
-  (require 'org)
+  (eval-and-compile (require 'org))
   (let* ((arg (plist-get plist :headline-levels)))
     (progn
       (find-file filename)
@@ -478,9 +478,10 @@
 PLIST is the property list for the given project.
 FILENAME is the filename of the file to be published."
   ;; make sure eshell/cp code is loaded
-  (require 'eshell)
-  (require 'esh-maint)
-  (require 'em-unix)
+  (eval-and-compile
+    (require 'eshell)
+    (require 'esh-maint)
+    (require 'em-unix))
   (let ((destination (file-name-as-directory (plist-get plist :publishing-directory))))
     (eshell/cp filename destination)))
--- a/lisp/textmodes/reftex.el	Sat Oct 20 23:55:30 2007 +0000
+++ b/lisp/textmodes/reftex.el	Sun Oct 21 00:24:32 2007 +0000
@@ -281,6 +281,8 @@
 ;; Stuff that needs to be there when we use defcustom
 (require 'custom)

+(require 'easymenu)
+
 (defvar reftex-tables-dirty t
   "Flag showing if tables need to be re-computed.")

@@ -2425,8 +2427,6 @@
 (defvar reftex-isearch-minor-mode nil)
 (make-variable-buffer-local 'reftex-isearch-minor-mode)

-(require 'easymenu)
-
 (easy-menu-define reftex-mode-menu reftex-mode-map
  "Menu used in RefTeX mode"
  `("Ref"
@@ -2583,7 +2583,7 @@
   "Read documentation for RefTeX in the info system.
 With optional NODE, go directly to that node."
   (interactive)
-  (require 'info)
+  (eval-and-compile (require 'info))
   (Info-goto-node (format "(reftex)%s" (or node ""))))

 ;;; Install the kill-buffer and kill-emacs hooks ------------------------------
--- a/lisp/w32-vars.el	Sat Oct 20 23:55:30 2007 +0000
+++ b/lisp/w32-vars.el	Sun Oct 21 00:24:32 2007 +0000
@@ -155,6 +155,7 @@
   :type 'boolean
   :group 'killing)

+(provide 'w32-vars)

 ;;; arch-tag: ee2394fb-9db7-4c15-a8f0-66b47f4a2bb1
 ;;; w32-vars.el ends here