Commit 4add8580 authored by Juanma Barranquero's avatar Juanma Barranquero
Browse files

(icon-edit, *mouse-window*, *mouse-x*, *mouse-y*, menu, char):

Defvar at compile time.
(sc::menu): Declare it before use.
(sc::pack-one-line): Use `let', not `let*'.
parent 05470ac8
2005-08-24 Juanma Barranquero <lekktu@gmail.com> 2005-08-24 Juanma Barranquero <lekktu@gmail.com>
   
* emerge.el (merge-begin, merge-end, template, A-begin, A-end)
(B-begin, B-end, diff, diff-vector, valid-diff): Defvar at compile
time to silence the byte-compiler.
* ibuffer.el (ibuffer-compile-make-eliding-form) * ibuffer.el (ibuffer-compile-make-eliding-form)
(ibuffer-check-formats): Use `with-no-warnings' to hide references (ibuffer-check-formats): Use `with-no-warnings' to hide references
to `ibuffer-elide-long-columns' (which is defined on ibuffer.el, to `ibuffer-elide-long-columns' (which is defined on ibuffer.el,
...@@ -15,9 +19,25 @@ ...@@ -15,9 +19,25 @@
(ibuffer-cached-formats, ibuffer-cached-elide-long-columns): (ibuffer-cached-formats, ibuffer-cached-elide-long-columns):
Declare them before use. Declare them before use.
   
* emerge.el (merge-begin, merge-end, template, A-begin, A-end) * info-xref.el (info-xref-xfile-alist, info-xref-filename-heading)
(B-begin, B-end, diff, diff-vector, valid-diff): Defvar at compile (info-xref-good, info-xref-bad): Defvar at compile time.
time to silence the byte-compiler.
* obsolete/mlsupport.el (filter-region, execute-monitor-command):
Use `let*' instead of `let'.
* obsolete/sun-curs.el (icon-edit, *mouse-window*, *mouse-x*)
(*mouse-y*, menu, char): Defvar at compile time.
(sc::menu): Declare it before use.
(sc::pack-one-line): Use `let', not `let*'.
* obsolete/swedish.el (news-inews-hook, news-group-hook-alist)
(mail-send-hook): Defvar at compile time.
* term/bg-mouse.el (bg-mouse-x, bg-mouse-y, bg-cursor-window):
Defvar at compile time.
* term/sun-mouse.el (current-global-mousemap)
(current-local-mousemap): Declare them before use.
   
2005-08-24 Carsten Dominik <dominik@science.uva.nl> 2005-08-24 Carsten Dominik <dominik@science.uva.nl>
   
......
...@@ -32,7 +32,12 @@ ...@@ -32,7 +32,12 @@
;;; ;;;
;;; 9-dec-86 Jeff Peck, Sun Microsystems Inc. <peck@sun.com> ;;; 9-dec-86 Jeff Peck, Sun Microsystems Inc. <peck@sun.com>
(eval-when-compile (require 'cl)) (eval-when-compile
(require 'cl)
(defvar *edit-icon*) (defvar char)
;; These are from term/sun-mouse.el
(defvar *mouse-window*) (defvar *mouse-x*) (defvar *mouse-y*) (defvar menu))
(require 'sun-fns) (require 'sun-fns)
(eval-and-compile (eval-and-compile
...@@ -79,9 +84,11 @@ Otherwise, ICON should be a vector or the name of a vector of [x y 32-chars]" ...@@ -79,9 +84,11 @@ Otherwise, ICON should be a vector or the name of a vector of [x y 32-chars]"
(if (symbolp icon) (setq icon (symbol-value icon))) (if (symbolp icon) (setq icon (symbol-value icon)))
(sun-change-cursor-icon icon)) (sun-change-cursor-icon icon))
;; This does not make much sense...
(make-local-variable '*edit-icon*) (make-local-variable '*edit-icon*)
(defvar icon-edit nil)
(make-variable-buffer-local 'icon-edit) (make-variable-buffer-local 'icon-edit)
(setq-default icon-edit nil)
(or (assq 'icon-edit minor-mode-alist) (or (assq 'icon-edit minor-mode-alist)
(push '(icon-edit " IconEdit") minor-mode-alist)) (push '(icon-edit " IconEdit") minor-mode-alist))
...@@ -109,9 +116,6 @@ Otherwise, ICON should be a vector or the name of a vector of [x y 32-chars]" ...@@ -109,9 +116,6 @@ Otherwise, ICON should be a vector or the name of a vector of [x y 32-chars]"
(insert char) (insert char)
(sc::goto-hotspot)) (sc::goto-hotspot))
(defun sc::menu-function (window x y)
(sun-menu-evaluate window (1+ x) y sc::menu))
(defmenu sc::menu (defmenu sc::menu
("Cursor Menu") ("Cursor Menu")
("Pack & Use" sc::pack-buffer-to-cursor) ("Pack & Use" sc::pack-buffer-to-cursor)
...@@ -127,6 +131,9 @@ Otherwise, ICON should be a vector or the name of a vector of [x y 32-chars]" ...@@ -127,6 +131,9 @@ Otherwise, ICON should be a vector or the name of a vector of [x y 32-chars]"
("Quit" sc::quit-edit) ("Quit" sc::quit-edit)
) )
(defun sc::menu-function (window x y)
(sun-menu-evaluate window (1+ x) y sc::menu))
(defun sc::quit-edit () (defun sc::quit-edit ()
(interactive) (interactive)
(bury-buffer (current-buffer)) (bury-buffer (current-buffer))
...@@ -202,7 +209,7 @@ Otherwise, ICON should be a vector or the name of a vector of [x y 32-chars]" ...@@ -202,7 +209,7 @@ Otherwise, ICON should be a vector or the name of a vector of [x y 32-chars]"
) )
(defun sc::pack-one-line (dummy) (defun sc::pack-one-line (dummy)
(let* (char chr1 chr2) (let (char chr1 chr2)
(setq char 0 chr1 (mapconcat 'sc::pack-one-char "12345678" "") chr1 char) (setq char 0 chr1 (mapconcat 'sc::pack-one-char "12345678" "") chr1 char)
(setq char 0 chr2 (mapconcat 'sc::pack-one-char "12345678" "") chr2 char) (setq char 0 chr2 (mapconcat 'sc::pack-one-char "12345678" "") chr2 char)
(forward-line 1) (forward-line 1)
......
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