Commit 729f1525 authored by Dan Nicolaescu's avatar Dan Nicolaescu
Browse files

* 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.
parent 64b53a1f
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> 2007-10-20 Juri Linkov <juri@jurta.org>
* textmodes/fill.el (fill-paragraph): When the region is active, * textmodes/fill.el (fill-paragraph): When the region is active,
......
...@@ -45,6 +45,9 @@ ...@@ -45,6 +45,9 @@
(defvar original-date) (defvar original-date)
(require 'calendar) (require 'calendar)
(eval-when-compile
(require 'diary-lib)
(require 'holidays))
(defun hebrew-calendar-leap-year-p (year) (defun hebrew-calendar-leap-year-p (year)
"t if YEAR is a Hebrew calendar leap year." "t if YEAR is a Hebrew calendar leap year."
......
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
(defvar original-date) (defvar original-date)
(require 'cal-julian) (require 'cal-julian)
(eval-when-compile (require 'diary-lib))
(defvar calendar-islamic-month-name-array (defvar calendar-islamic-month-name-array
["Muharram" "Safar" "Rabi I" "Rabi II" "Jumada I" "Jumada II" ["Muharram" "Safar" "Rabi I" "Rabi II" "Jumada I" "Jumada II"
......
...@@ -914,7 +914,8 @@ Number of entries for each category is given by `todo-print-priorities'." ...@@ -914,7 +914,8 @@ Number of entries for each category is given by `todo-print-priorities'."
(eval-when-compile (eval-when-compile
(defvar date) (defvar date)
(defvar entry)) (defvar entry)
(require 'calendar))
;; Read about this function in the setup instructions above! ;; Read about this function in the setup instructions above!
;;;###autoload ;;;###autoload
......
...@@ -194,11 +194,11 @@ ...@@ -194,11 +194,11 @@
(progn (progn
(load "international/ccl") (load "international/ccl")
(load "international/code-pages") (load "international/code-pages")
(load "w32-vars")
(load "term/w32-win") (load "term/w32-win")
(load "ls-lisp") (load "ls-lisp")
(load "disp-table") ; needed to setup ibm-pc char set, see internal.el (load "disp-table") ; needed to setup ibm-pc char set, see internal.el
(load "dos-w32") (load "dos-w32")
(load "w32-vars")
(load "w32-fns"))) (load "w32-fns")))
(if (eq system-type 'ms-dos) (if (eq system-type 'ms-dos)
(progn (progn
......
...@@ -1281,6 +1281,20 @@ Logfiles are kept in `rcirc-log-directory'." ...@@ -1281,6 +1281,20 @@ Logfiles are kept in `rcirc-log-directory'."
:type 'boolean :type 'boolean
:group 'rcirc) :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) (defun rcirc-print (process sender response target text &optional activity)
"Print TEXT in the buffer associated with TARGET. "Print TEXT in the buffer associated with TARGET.
Format based on SENDER and RESPONSE. If ACTIVITY is non-nil, Format based on SENDER and RESPONSE. If ACTIVITY is non-nil,
...@@ -2083,20 +2097,6 @@ keywords when no KEYWORD is given." ...@@ -2083,20 +2097,6 @@ keywords when no KEYWORD is given."
(rcirc-browse-url-at-point (posn-point position))))) (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) (defun rcirc-markup-timestamp (sender response)
(goto-char (point-min)) (goto-char (point-min))
(insert (rcirc-facify (format-time-string rcirc-time-format) (insert (rcirc-facify (format-time-string rcirc-time-format)
......
...@@ -296,14 +296,14 @@ a reflection." ...@@ -296,14 +296,14 @@ a reflection."
(defun bb-up (count) (defun bb-up (count)
(interactive "p") (interactive "p")
(while (and (> count 0) (> bb-y -1)) (while (and (> count 0) (> bb-y -1))
(previous-line 1) (forward-line -1)
(setq bb-y (1- bb-y)) (setq bb-y (1- bb-y))
(setq count (1- count)))) (setq count (1- count))))
(defun bb-down (count) (defun bb-down (count)
(interactive "p") (interactive "p")
(while (and (> count 0) (< bb-y 8)) (while (and (> count 0) (< bb-y 8))
(next-line 1) (forward-line 1)
(setq bb-y (1+ bb-y)) (setq bb-y (1+ bb-y))
(setq count (1- count)))) (setq count (1- count))))
......
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
(unless success (delete-frame frame))) (unless success (delete-frame 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 ;; More or less useful imitations of certain X-functions. A lot of the
......
...@@ -63,6 +63,7 @@ ...@@ -63,6 +63,7 @@
;;; Code: ;;; Code:
(defvar msdos-color-values) (defvar msdos-color-values)
(defvar w32-tty-standard-colors)
;; The following list is taken from rgb.txt distributed with X. ;; The following list is taken from rgb.txt distributed with X.
;; ;;
......
...@@ -79,12 +79,14 @@ ...@@ -79,12 +79,14 @@
(require 'menu-bar) (require 'menu-bar)
(require 'dnd) (require 'dnd)
(require 'code-pages) (require 'code-pages)
(require 'w32-vars)
;; Keep an obsolete alias for w32-focus-frame in case it is used by code ;; Keep an obsolete alias for w32-focus-frame in case it is used by code
;; outside Emacs. ;; outside Emacs.
(define-obsolete-function-alias 'w32-focus-frame 'x-focus-frame "23.1") (define-obsolete-function-alias 'w32-focus-frame 'x-focus-frame "23.1")
(defvar xlfd-regexp-registry-subnum) (defvar xlfd-regexp-registry-subnum)
(defvar w32-color-map) ;; defined in w32fns.c
;; Conditional on new-fontset so bootstrapping works on non-GUI compiles ;; Conditional on new-fontset so bootstrapping works on non-GUI compiles
(if (fboundp 'new-fontset) (if (fboundp 'new-fontset)
......
...@@ -443,7 +443,7 @@ nil if not found." ...@@ -443,7 +443,7 @@ nil if not found."
"Publish an org file to HTML. "Publish an org file to HTML.
PLIST is the property list for the given project. PLIST is the property list for the given project.
FILENAME is the filename of the org file to be published." 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))) (let* ((arg (plist-get plist :headline-levels)))
(progn (progn
(find-file filename) (find-file filename)
...@@ -464,7 +464,7 @@ FILENAME is the filename of the org file to be published." ...@@ -464,7 +464,7 @@ FILENAME is the filename of the org file to be published."
"Publish an org file to FORMAT. "Publish an org file to FORMAT.
PLIST is the property list for the given project. PLIST is the property list for the given project.
FILENAME is the filename of the org file to be published." 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))) (let* ((arg (plist-get plist :headline-levels)))
(progn (progn
(find-file filename) (find-file filename)
...@@ -478,9 +478,10 @@ FILENAME is the filename of the org file to be published." ...@@ -478,9 +478,10 @@ FILENAME is the filename of the org file to be published."
PLIST is the property list for the given project. PLIST is the property list for the given project.
FILENAME is the filename of the file to be published." FILENAME is the filename of the file to be published."
;; make sure eshell/cp code is loaded ;; make sure eshell/cp code is loaded
(require 'eshell) (eval-and-compile
(require 'esh-maint) (require 'eshell)
(require 'em-unix) (require 'esh-maint)
(require 'em-unix))
(let ((destination (file-name-as-directory (plist-get plist :publishing-directory)))) (let ((destination (file-name-as-directory (plist-get plist :publishing-directory))))
(eshell/cp filename destination))) (eshell/cp filename destination)))
......
...@@ -281,6 +281,8 @@ ...@@ -281,6 +281,8 @@
;; Stuff that needs to be there when we use defcustom ;; Stuff that needs to be there when we use defcustom
(require 'custom) (require 'custom)
(require 'easymenu)
(defvar reftex-tables-dirty t (defvar reftex-tables-dirty t
"Flag showing if tables need to be re-computed.") "Flag showing if tables need to be re-computed.")
...@@ -2425,8 +2427,6 @@ IGNORE-WORDS List of words which should be removed from the string." ...@@ -2425,8 +2427,6 @@ IGNORE-WORDS List of words which should be removed from the string."
(defvar reftex-isearch-minor-mode nil) (defvar reftex-isearch-minor-mode nil)
(make-variable-buffer-local 'reftex-isearch-minor-mode) (make-variable-buffer-local 'reftex-isearch-minor-mode)
(require 'easymenu)
(easy-menu-define reftex-mode-menu reftex-mode-map (easy-menu-define reftex-mode-menu reftex-mode-map
"Menu used in RefTeX mode" "Menu used in RefTeX mode"
`("Ref" `("Ref"
...@@ -2583,7 +2583,7 @@ IGNORE-WORDS List of words which should be removed from the string." ...@@ -2583,7 +2583,7 @@ IGNORE-WORDS List of words which should be removed from the string."
"Read documentation for RefTeX in the info system. "Read documentation for RefTeX in the info system.
With optional NODE, go directly to that node." With optional NODE, go directly to that node."
(interactive) (interactive)
(require 'info) (eval-and-compile (require 'info))
(Info-goto-node (format "(reftex)%s" (or node "")))) (Info-goto-node (format "(reftex)%s" (or node ""))))
;;; Install the kill-buffer and kill-emacs hooks ------------------------------ ;;; Install the kill-buffer and kill-emacs hooks ------------------------------
......
...@@ -155,6 +155,7 @@ This is in addition to the primary selection." ...@@ -155,6 +155,7 @@ This is in addition to the primary selection."
:type 'boolean :type 'boolean
:group 'killing) :group 'killing)
(provide 'w32-vars)
;;; arch-tag: ee2394fb-9db7-4c15-a8f0-66b47f4a2bb1 ;;; arch-tag: ee2394fb-9db7-4c15-a8f0-66b47f4a2bb1
;;; w32-vars.el ends here ;;; w32-vars.el ends here
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment