aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-08-11 01:23:07 +0000
committerGlenn Morris2008-08-11 01:23:07 +0000
commitf2d9c15f597ab17a78244c4e019d708d5290ac19 (patch)
treeeea7f9d13952b4727dfb8db3509d5e53cdda4fac
parent79e43d6ecac6a45c110cd7634caae4bcf6d6ffdf (diff)
downloademacs-f2d9c15f597ab17a78244c4e019d708d5290ac19.tar.gz
emacs-f2d9c15f597ab17a78244c4e019d708d5290ac19.zip
Add declarations for builds without X.
-rw-r--r--lisp/ChangeLog17
-rw-r--r--lisp/calendar/cal-menu.el2
-rw-r--r--lisp/calendar/calendar.el2
-rw-r--r--lisp/calendar/holidays.el2
-rw-r--r--lisp/dired.el1
-rw-r--r--lisp/hi-lock.el2
-rw-r--r--lisp/mouse.el1
-rw-r--r--lisp/progmodes/cperl-mode.el2
-rw-r--r--lisp/term/ns-win.el9
-rw-r--r--lisp/term/w32-win.el4
-rw-r--r--lisp/term/x-win.el6
11 files changed, 48 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 954502ce31d..70004b7c68d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
12008-08-11 Glenn Morris <rgm@gnu.org>
2
3 * dired.el (x-popup-menu):
4 * hi-lock.el (x-popup-menu):
5 * mouse.el (font-face-attributes):
6 * calendar/cal-menu.el (x-popup-menu):
7 * calendar/calendar.el (x-popup-menu):
8 * calendar/holidays.el (x-popup-menu):
9 * progmodes/cperl-mode.el (x-popup-menu):
10 * term/ns-win.el (dnd-open-file, tool-bar-mode, scroll-bar-scale)
11 (x-open-connection):
12 * term/w32-win.el (x-colors, x-handle-args, x-parse-geometry)
13 (x-command-line-resources):
14 * term/x-win.el (x-colors, x-parse-geometry, x-resource-name)
15 (x-display-name, x-command-line-resources):
16 Add declarations for builds without X.
17
12008-08-10 Glenn Morris <rgm@gnu.org> 182008-08-10 Glenn Morris <rgm@gnu.org>
2 19
3 * calendar/cal-bahai.el (holiday-bahai): Doc fix. 20 * calendar/cal-bahai.el (holiday-bahai): Doc fix.
diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el
index e456f85bfe3..8818498480d 100644
--- a/lisp/calendar/cal-menu.el
+++ b/lisp/calendar/cal-menu.el
@@ -153,6 +153,8 @@
153 ["Backward 1 Year" (calendar-scroll-right 12) :keys "4 M-v"]) 153 ["Backward 1 Year" (calendar-scroll-right 12) :keys "4 M-v"])
154 "Key map for \"Scroll\" menu in the calendar.") 154 "Key map for \"Scroll\" menu in the calendar.")
155 155
156(declare-function x-popup-menu "xmenu.c" (position menu))
157
156(defmacro cal-menu-x-popup-menu (event title &rest body) 158(defmacro cal-menu-x-popup-menu (event title &rest body)
157 "Call `x-popup-menu' at position EVENT, with TITLE and contents BODY. 159 "Call `x-popup-menu' at position EVENT, with TITLE and contents BODY.
158Signals an error if popups are unavailable." 160Signals an error if popups are unavailable."
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index dc2f8ce9079..68a14068757 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -2422,6 +2422,8 @@ DATE is (month day year). Calendars that do not apply are omitted."
2422 (format "Mayan date: %s" 2422 (format "Mayan date: %s"
2423 (calendar-mayan-date-string date)))))) 2423 (calendar-mayan-date-string date))))))
2424 2424
2425(declare-function x-popup-menu "xmenu.c" (position menu))
2426
2425(defun calendar-print-other-dates (&optional event) 2427(defun calendar-print-other-dates (&optional event)
2426 "Show dates on other calendars for date under the cursor. 2428 "Show dates on other calendars for date under the cursor.
2427If called by a mouse-event, pops up a menu with the result." 2429If called by a mouse-event, pops up a menu with the result."
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 8b554e05825..9e703df114f 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -624,6 +624,8 @@ The holidays are those in the list `calendar-holidays'."
624(define-obsolete-function-alias 624(define-obsolete-function-alias
625 'check-calendar-holidays 'calendar-check-holidays "23.1") 625 'check-calendar-holidays 'calendar-check-holidays "23.1")
626 626
627(declare-function x-popup-menu "xmenu.c" (position menu))
628
627;;;###cal-autoload 629;;;###cal-autoload
628(defun calendar-cursor-holidays (&optional date event) 630(defun calendar-cursor-holidays (&optional date event)
629 "Find holidays for the date specified by the cursor in the calendar window. 631 "Find holidays for the date specified by the cursor in the calendar window.
diff --git a/lisp/dired.el b/lisp/dired.el
index 06a11a6b478..a7388ddc08e 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3314,6 +3314,7 @@ Anything else means ask for each directory."
3314 (message-box 3314 (message-box
3315 "Dired recursive copies are currently disabled.\nSee the variable `dired-recursive-copies'.")) 3315 "Dired recursive copies are currently disabled.\nSee the variable `dired-recursive-copies'."))
3316 3316
3317(declare-function x-popup-menu "xmenu.c" (position menu))
3317 3318
3318(defun dired-dnd-do-ask-action (uri) 3319(defun dired-dnd-do-ask-action (uri)
3319 ;; No need to get actions and descriptions from the source, 3320 ;; No need to get actions and descriptions from the source,
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index da6bd441240..4d9be487266 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -447,6 +447,8 @@ lower-case letters made case insensitive."
447 (unless hi-lock-mode (hi-lock-mode 1)) 447 (unless hi-lock-mode (hi-lock-mode 1))
448 (hi-lock-set-pattern regexp face)) 448 (hi-lock-set-pattern regexp face))
449 449
450(declare-function x-popup-menu "xmenu.c" (position menu))
451
450;;;###autoload 452;;;###autoload
451(defalias 'unhighlight-regexp 'hi-lock-unface-buffer) 453(defalias 'unhighlight-regexp 'hi-lock-unface-buffer)
452;;;###autoload 454;;;###autoload
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 416336d7e49..e8adeb88101 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -2473,6 +2473,7 @@ choose a font."
2473(declare-function x-select-font "xfns.c" (&optional frame ignored)) ; USE_GTK 2473(declare-function x-select-font "xfns.c" (&optional frame ignored)) ; USE_GTK
2474(declare-function buffer-face-mode-invoke "face-remap" 2474(declare-function buffer-face-mode-invoke "face-remap"
2475 (face arg &optional interactive)) 2475 (face arg &optional interactive))
2476(declare-function font-face-attributes "font.c" (font &optional frame))
2476 2477
2477(defun mouse-appearance-menu (event) 2478(defun mouse-appearance-menu (event)
2478 (interactive "@e") 2479 (interactive "@e")
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 57ecf03e2c7..9f57f62b94d 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -7089,6 +7089,8 @@ Use as
7089 (cons cons1 (car cperl-hierarchy))))))) 7089 (cons cons1 (car cperl-hierarchy)))))))
7090 (end-of-line)))) 7090 (end-of-line))))
7091 7091
7092(declare-function x-popup-menu "xmenu.c" (position menu))
7093
7092(defun cperl-tags-hier-init (&optional update) 7094(defun cperl-tags-hier-init (&optional update)
7093 "Show hierarchical menu of classes and methods. 7095 "Show hierarchical menu of classes and methods.
7094Finds info about classes by a scan of loaded TAGS files. 7096Finds info about classes by a scan of loaded TAGS files.
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index f11b34a7abf..0cd5ffc12de 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -749,6 +749,8 @@ this defaults to \"printenv\"."
749(defvar ns-input-spi-name) 749(defvar ns-input-spi-name)
750(defvar ns-input-spi-arg) 750(defvar ns-input-spi-arg)
751 751
752(declare-function dnd-open-file "dnd" (uri action))
753
752(defun ns-spi-service-call () 754(defun ns-spi-service-call ()
753 "Respond to a service request." 755 "Respond to a service request."
754 (interactive) 756 (interactive)
@@ -1209,6 +1211,9 @@ unless the current buffer is a scratch buffer.")
1209;; (if this is not done, modeline is dimmed until first interaction) 1211;; (if this is not done, modeline is dimmed until first interaction)
1210(add-hook 'after-make-frame-functions 'select-frame) 1212(add-hook 'after-make-frame-functions 'select-frame)
1211 1213
1214(defvar tool-bar-mode)
1215(declare-function tool-bar-mode "tool-bar" (&optional arg))
1216
1212;; Based on a function by David Reitter <dreitter@inf.ed.ac.uk> ; 1217;; Based on a function by David Reitter <dreitter@inf.ed.ac.uk> ;
1213;; see http://lists.gnu.org/archive/html/emacs-devel/2005-09/msg00681.html . 1218;; see http://lists.gnu.org/archive/html/emacs-devel/2005-09/msg00681.html .
1214(defun ns-toggle-toolbar (&optional frame) 1219(defun ns-toggle-toolbar (&optional frame)
@@ -1397,6 +1402,8 @@ See the documentation of `create-fontset-from-fontset-spec for the format.")
1397(global-unset-key [vertical-scroll-bar mouse-1]) 1402(global-unset-key [vertical-scroll-bar mouse-1])
1398(global-unset-key [vertical-scroll-bar drag-mouse-1]) 1403(global-unset-key [vertical-scroll-bar drag-mouse-1])
1399 1404
1405(declare-function scroll-bar-scale "scroll-bar" (num-denom whole))
1406
1400(defun ns-scroll-bar-move (event) 1407(defun ns-scroll-bar-move (event)
1401 "Scroll the frame according to a Nextstep scroller event." 1408 "Scroll the frame according to a Nextstep scroller event."
1402 (interactive "e") 1409 (interactive "e")
@@ -1561,6 +1568,8 @@ Note, tranparency works better on Tiger (10.4) and higher."
1561 "Non-nil if Nextstep windowing has been initialized.") 1568 "Non-nil if Nextstep windowing has been initialized.")
1562 1569
1563(declare-function ns-list-services "nsfns.m" ()) 1570(declare-function ns-list-services "nsfns.m" ())
1571(declare-function x-open-connection "xfns.c"
1572 (display &optional xrm-string must-succeed))
1564 1573
1565;; Do the actual Nextstep Windows setup here; the above code just 1574;; Do the actual Nextstep Windows setup here; the above code just
1566;; defines functions and variables that we use now. 1575;; defines functions and variables that we use now.
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 7cc0cd2f62b..cd000ea53db 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -147,6 +147,7 @@ the last file dropped is selected."
147(global-set-key [language-change] 'ignore) 147(global-set-key [language-change] 'ignore)
148 148
149(defvar x-resource-name) 149(defvar x-resource-name)
150(defvar x-colors)
150 151
151 152
152(defun xw-defined-colors (&optional frame) 153(defun xw-defined-colors (&optional frame)
@@ -225,6 +226,9 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
225(declare-function create-fontset-from-x-resource "fontset" ()) 226(declare-function create-fontset-from-x-resource "fontset" ())
226(declare-function x-get-resource "frame.c" 227(declare-function x-get-resource "frame.c"
227 (attribute class &optional component subclass)) 228 (attribute class &optional component subclass))
229(declare-function x-handle-args "common-win" (args))
230(declare-function x-parse-geometry "frame.c" (string))
231(defvar x-command-line-resources)
228 232
229(defun w32-initialize-window-system () 233(defun w32-initialize-window-system ()
230 "Initialize Emacs for W32 GUI frames." 234 "Initialize Emacs for W32 GUI frames."
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 4bcbb3e7031..1cfdeaf084b 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -253,6 +253,8 @@ exists."
253(defconst x-pointer-invisible 255) 253(defconst x-pointer-invisible 255)
254 254
255 255
256(defvar x-colors)
257
256(defun xw-defined-colors (&optional frame) 258(defun xw-defined-colors (&optional frame)
257 "Internal function called by `defined-colors', which see." 259 "Internal function called by `defined-colors', which see."
258 (or frame (setq frame (selected-frame))) 260 (or frame (setq frame (selected-frame)))
@@ -1449,6 +1451,10 @@ The value nil is the same as this list:
1449(declare-function x-server-max-request-size "xfns.c" (&optional terminal)) 1451(declare-function x-server-max-request-size "xfns.c" (&optional terminal))
1450(declare-function x-get-resource "frame.c" 1452(declare-function x-get-resource "frame.c"
1451 (attribute class &optional component subclass)) 1453 (attribute class &optional component subclass))
1454(declare-function x-parse-geometry "frame.c" (string))
1455(defvar x-resource-name)
1456(defvar x-display-name)
1457(defvar x-command-line-resources)
1452 1458
1453(defun x-initialize-window-system () 1459(defun x-initialize-window-system ()
1454 "Initialize Emacs for X frames and open the first connection to an X server." 1460 "Initialize Emacs for X frames and open the first connection to an X server."