yatex

changeset 353:2a72779d9c50 dev

Rewrite lambda notations to suppress annoying warnings from emacs24
author HIROSE Yuuji <yuuji@gentei.org>
date Sun, 21 Dec 2014 14:20:01 +0900
parents ecf7b5543e65
children 5465428f5a68
files yahtml.el yatex.el yatex19.el yatexenv.el yatexgen.el yatexhie.el yatexhks.el yatexhlp.el yatexlib.el yatexm-o.el yatexpkg.el yatexsec.el
diffstat 12 files changed, 111 insertions(+), 87 deletions(-) [+]
line diff
     1.1 --- a/yahtml.el	Sun Dec 21 13:57:27 2014 +0900
     1.2 +++ b/yahtml.el	Sun Dec 21 14:20:01 2014 +0900
     1.3 @@ -1,6 +1,6 @@
     1.4  ;;; yahtml.el --- Yet Another HTML mode -*- coding: sjis -*-
     1.5  ;;; (c) 1994-2013 by HIROSE Yuuji [yuuji(@)yatex.org]
     1.6 -;;; Last modified Tue Dec 16 11:11:25 2014 on firestorm
     1.7 +;;; Last modified Sun Dec 21 14:02:00 2014 on firestorm
     1.8  ;;; $Id$
     1.9  
    1.10  (defconst yahtml-revision-number "1.77"
    1.11 @@ -344,8 +344,8 @@
    1.12      (YaTeX-define-key "l" 'yahtml-insert-tag map)
    1.13      (YaTeX-define-key "L" 'yahtml-insert-tag-region map)
    1.14      (YaTeX-define-key "m" 'yahtml-insert-single map)
    1.15 -    (YaTeX-define-key "n" '(lambda () (interactive) (insert (if yahtml-prefer-upcases "<BR>" "<br>"))) map)
    1.16 -    (YaTeX-define-key "-" '(lambda () (interactive) (insert (if yahtml-prefer-upcases "<HR>" "<hr>") "\n")) map)
    1.17 +    (YaTeX-define-key "n" (function(lambda () (interactive) (insert (if yahtml-prefer-upcases "<BR>" "<br>")))) map)
    1.18 +    (YaTeX-define-key "-" (function(lambda () (interactive) (insert (if yahtml-prefer-upcases "<HR>" "<hr>") "\n"))) map)
    1.19      (YaTeX-define-key "p" 'yahtml-insert-p map)
    1.20      (if YaTeX-no-begend-shortcut
    1.21  	(progn
    1.22 @@ -818,11 +818,12 @@
    1.23  	   (cons "typeface" yahtml-menu-map-typeface)))))
    1.24    (if (featurep 'xemacs)
    1.25        (add-hook 'yahtml-mode-hook
    1.26 -		'(lambda ()
    1.27 +		(function
    1.28 +		 (lambda ()
    1.29  		   (or (assoc "yahtml" current-menubar)
    1.30  		       (progn
    1.31  			 (set-buffer-menubar (copy-sequence current-menubar))
    1.32 -			 (add-submenu nil yahtml-menu-map))))))))
    1.33 +			 (add-submenu nil yahtml-menu-map)))))))))
    1.34  
    1.35  ;;; ----------- Completion ----------
    1.36  (defvar yahtml-last-begend "html")
    1.37 @@ -1017,7 +1018,7 @@
    1.38  	  (with-output-to-temp-buffer "*Completions*"
    1.39  	    (princ "Possible completinos are:\n")
    1.40  	    (princ
    1.41 -	     (mapconcat '(lambda (x) x)  (funcall listfunc) "\n")))
    1.42 +	     (mapconcat (function(lambda (x) x))  (funcall listfunc) "\n")))
    1.43  	(delete-region (point) beg)
    1.44  	(insert cmpl)))
    1.45       ((null cmpl)
    1.46 @@ -1224,8 +1225,8 @@
    1.47  (defun yahtml-make-style-parameter (proplist)
    1.48    "Make CSS property definitions in style attribute."
    1.49    (mapconcat
    1.50 -   '(lambda (x) (if (and (cdr x) (string< "" (cdr x)))
    1.51 -		    (format "%s: %s;" (car x) (cdr x))))
    1.52 +   (function (lambda (x) (if (and (cdr x) (string< "" (cdr x)))
    1.53 +			     (format "%s: %s;" (car x) (cdr x)))))
    1.54     (delq nil proplist)
    1.55     " "))
    1.56  
     2.1 --- a/yatex.el	Sun Dec 21 13:57:27 2014 +0900
     2.2 +++ b/yatex.el	Sun Dec 21 14:20:01 2014 +0900
     2.3 @@ -1,6 +1,6 @@
     2.4  ;;; yatex.el --- Yet Another tex-mode for emacs //野鳥// -*- coding: sjis -*-
     2.5  ;;; (c)1991-2014 by HIROSE Yuuji.[yuuji@yatex.org]
     2.6 -;;; Last modified Sun Dec 21 12:13:34 2014 on firestorm
     2.7 +;;; Last modified Sun Dec 21 14:02:49 2014 on firestorm
     2.8  ;;; $Id$
     2.9  ;;; The latest version of this software is always available at;
    2.10  ;;; http://www.yatex.org/
    2.11 @@ -483,8 +483,8 @@
    2.12    (YaTeX-define-key "$" 'YaTeX-insert-dollars-region)
    2.13    (YaTeX-define-key "i" 'YaTeX-fill-item)
    2.14    (YaTeX-define-key "\\"
    2.15 -   '(lambda () (interactive)
    2.16 -      (insert (if (YaTeX-in-math-mode-p) "\\backslash" "\\textbackslash"))))
    2.17 +   (function(lambda () (interactive)
    2.18 +      (insert (if (YaTeX-in-math-mode-p) "\\backslash" "\\textbackslash")))))
    2.19    (if YaTeX-no-begend-shortcut
    2.20        (progn
    2.21  	(YaTeX-define-key "B" 'YaTeX-make-begin-end-region)
    2.22 @@ -528,12 +528,12 @@
    2.23    (YaTeX-define-key "d" 'YaTeX-display-hierarchy)
    2.24    (YaTeX-define-key "x" YaTeX-user-extensional-map)
    2.25    (YaTeX-define-key "n"
    2.26 -    '(lambda () (interactive)
    2.27 -       (insert "\\" (if (YaTeX-on-section-command-p "o?oalign") "crcr" "\\"))))
    2.28 +    (function(lambda () (interactive)
    2.29 +       (insert "\\" (if (YaTeX-on-section-command-p "o?oalign") "crcr" "\\")))))
    2.30    (if YaTeX-dos
    2.31        (define-key YaTeX-prefix-map "\C-r"
    2.32 -	'(lambda () (interactive)
    2.33 -	   (YaTeX-set-screen-height YaTeX-saved-screen-height) (recenter)))))
    2.34 +	(function(lambda () (interactive)
    2.35 +	   (YaTeX-set-screen-height YaTeX-saved-screen-height) (recenter))))))
    2.36  
    2.37  (defvar YaTeX-section-completion-map nil
    2.38    "*Key map used at YaTeX completion in the minibuffer.")
     3.1 --- a/yatex19.el	Sun Dec 21 13:57:27 2014 +0900
     3.2 +++ b/yatex19.el	Sun Dec 21 14:20:01 2014 +0900
     3.3 @@ -1,6 +1,6 @@
     3.4  ;;; yatex19.el -- YaTeX facilities for Emacs 19 or later
     3.5  ;;; (c)1994-2013 by HIROSE Yuuji.[yuuji@yatex.org]
     3.6 -;;; Last modified Mon Apr  1 22:42:46 2013 on firestorm
     3.7 +;;; Last modified Sun Dec 21 14:03:48 2014 on firestorm
     3.8  ;;; $Id$
     3.9  
    3.10  ;;; Code:
    3.11 @@ -54,11 +54,11 @@
    3.12  	(list
    3.13  	 (if YaTeX-auto-math-mode nil
    3.14  	   (cons 'math (cons "Toggle math-mode"
    3.15 -			     '(lambda () (interactive)
    3.16 -				(YaTeX-switch-mode-menu nil ?t)))))
    3.17 +			     (function(lambda () (interactive)
    3.18 +				(YaTeX-switch-mode-menu nil ?t))))))
    3.19  	 (cons 'mod (cons "Toggle Modify Mode"
    3.20 -			  '(lambda () (interactive)
    3.21 -			     (YaTeX-switch-mode-menu nil ?m))))))))
    3.22 +			  (function(lambda () (interactive)
    3.23 +			     (YaTeX-switch-mode-menu nil ?m)))))))))
    3.24  (defvar YaTeX-mode-menu-map-percent (make-sparse-keymap "percent"))
    3.25  (YaTeX-define-menu
    3.26   'YaTeX-mode-menu-map-percent
    3.27 @@ -227,11 +227,12 @@
    3.28  
    3.29  (and (featurep 'xemacs)
    3.30       (add-hook 'yatex-mode-hook
    3.31 -	       '(lambda ()
    3.32 +	       (function
    3.33 +		(lambda ()
    3.34  		  (or (assoc "YaTeX" current-menubar)
    3.35  		      (progn
    3.36  			(set-buffer-menubar (copy-sequence current-menubar))
    3.37 -			(add-submenu nil YaTeX-mode-menu-map))))))
    3.38 +			(add-submenu nil YaTeX-mode-menu-map)))))))
    3.39  
    3.40  ;; Other key bindings for window-system
    3.41  ;(YaTeX-define-key [?\C- ] 'YaTeX-do-completion)
     4.1 --- a/yatexenv.el	Sun Dec 21 13:57:27 2014 +0900
     4.2 +++ b/yatexenv.el	Sun Dec 21 14:20:01 2014 +0900
     4.3 @@ -1,6 +1,6 @@
     4.4  ;;; yatexenv.el --- YaTeX environment-specific functions
     4.5  ;;; (c) 1994-2013 by HIROSE Yuuji.[yuuji@yatex.org]
     4.6 -;;; Last modified Wed Nov 20 14:14:39 2013 on firestorm
     4.7 +;;; Last modified Sun Dec 21 13:58:31 2014 on firestorm
     4.8  ;;; $Id$
     4.9  
    4.10  ;;; Code:
    4.11 @@ -198,10 +198,11 @@
    4.12      (YaTeX-indent-line)))
    4.13  
    4.14  (mapcar
    4.15 - '(lambda (s)
    4.16 + (function
    4.17 +  (lambda (s)
    4.18      (fset (intern (concat  "YaTeX-intelligent-newline-"
    4.19  			   (symbol-name s)))
    4.20 -	  'YaTeX-intelligent-newline-align))
    4.21 +	  'YaTeX-intelligent-newline-align)))
    4.22   '(align* flalign  flalign* matrix pmatrix bmatrix Bmatrix vmatrix Vmatrix
    4.23     cases eqnarray eqnarray* alignat alignat*))
    4.24  
     5.1 --- a/yatexgen.el	Sun Dec 21 13:57:27 2014 +0900
     5.2 +++ b/yatexgen.el	Sun Dec 21 14:20:01 2014 +0900
     5.3 @@ -1,7 +1,7 @@
     5.4  ;;; yatexgen.el --- YaTeX add-in function generator(rev.5)
     5.5  
     5.6  ;;; (c)1991-1995,1999,2000 by HIROSE Yuuji.[yuuji@yatex.org]
     5.7 -;;; Last modified Sat Sep  1 08:10:36 2012 on firestorm
     5.8 +;;; Last modified Sun Dec 21 14:04:49 2014 on firestorm
     5.9  ;;; $Id$
    5.10  
    5.11  ;;; Code:
    5.12 @@ -244,7 +244,8 @@
    5.13  	func-name (string ""))
    5.14      ;;Phase 1. extract argument from add-in string.
    5.15      (mapcar
    5.16 -     '(lambda (arg)
    5.17 +     (function
    5.18 +      (lambda (arg)
    5.19  	(let ((index 0) (match 0) beg end (carg (car arg)))
    5.20  	  (YaTeX-generate-display-message
    5.21  	   YaTeX-generate-read-prompt-message)
    5.22 @@ -265,7 +266,7 @@
    5.23  	       ((YaTeX-generate-ask-match-position)
    5.24  		(YaTeX-generate-register-match))))
    5.25  	    (setq index end))
    5.26 -	  (setq i (1+ i))))
    5.27 +	  (setq i (1+ i)))))
    5.28       args)
    5.29      ;;Phase 2. Generate function!!
    5.30      (setq i 0)
    5.31 @@ -287,10 +288,11 @@
    5.32       "(defun " func-name " ()\n"
    5.33       "  (let (")
    5.34      (mapcar
    5.35 -     '(lambda (arg)
    5.36 +     (function
    5.37 +      (lambda (arg)
    5.38  	(insert (format "(arg%d (read-string \"%s: \"))\n"
    5.39  			i (aref prompt (1- i))))
    5.40 -	(setq i (1+ i)))
    5.41 +	(setq i (1+ i))))
    5.42       args)
    5.43      (delete-region (point) (progn (forward-line -1) (end-of-line) (point)))
    5.44      (insert ")\n(concat " (YaTeX-generate-lisp-quote string)
     6.1 --- a/yatexhie.el	Sun Dec 21 13:57:27 2014 +0900
     6.2 +++ b/yatexhie.el	Sun Dec 21 14:20:01 2014 +0900
     6.3 @@ -1,7 +1,7 @@
     6.4  ;;; yatexhie.el --- YaTeX hierarchy browser
     6.5  ;;; 
     6.6  ;;; (c)1995-2013 by HIROSE Yuuji [yuuji@yatex.org]
     6.7 -;;; Last modified Mon Apr  1 22:43:34 2013 on firestorm
     6.8 +;;; Last modified Sun Dec 21 14:05:20 2014 on firestorm
     6.9  ;;; $Id$
    6.10  
    6.11  ;;; Code:
    6.12 @@ -75,8 +75,9 @@
    6.13  			(YaTeX-get-builtin "!")
    6.14  			(setq YaTeX-parent-file parent))))
    6.15  	      (cons (buffer-file-name (current-buffer))
    6.16 -		    (mapcar '(lambda (f) 	;return value
    6.17 -			       (YaTeX-document-hierarchy f basedir))
    6.18 +		    (mapcar (function 		;return value
    6.19 +			     (lambda (f)
    6.20 +			       (YaTeX-document-hierarchy f basedir)))
    6.21  			    (YaTeX-all-included-files))))))
    6.22      (message "Parsing [%s]...done" (file-name-nondirectory file))))
    6.23  
     7.1 --- a/yatexhks.el	Sun Dec 21 13:57:27 2014 +0900
     7.2 +++ b/yatexhks.el	Sun Dec 21 14:20:01 2014 +0900
     7.3 @@ -13,41 +13,56 @@
     7.4  ;;97/1/27
     7.5  (define-key YaTeX-user-extensional-map "v" 'YaTeX-section-overview)
     7.6  ;;initial version
     7.7 -(define-key YaTeX-user-extensional-map "0"
     7.8 -  '(lambda () (interactive) (YaTeX-make-section nil nil nil "part")))
     7.9 -(define-key YaTeX-user-extensional-map "1"
    7.10 -  '(lambda () (interactive) (YaTeX-make-section nil nil nil "chapter")))
    7.11 -(define-key YaTeX-user-extensional-map "2"
    7.12 -  '(lambda () (interactive) (YaTeX-make-section nil nil nil "section")))
    7.13 -(define-key YaTeX-user-extensional-map "3"
    7.14 -  '(lambda () (interactive) (YaTeX-make-section nil nil nil "subsection")))
    7.15 -(define-key YaTeX-user-extensional-map "4"
    7.16 -  '(lambda () (interactive) (YaTeX-make-section nil nil nil "subsubsection")))
    7.17 -(define-key YaTeX-user-extensional-map "5"
    7.18 -  '(lambda () (interactive) (YaTeX-make-section nil nil nil "paragraph")))
    7.19 -(define-key YaTeX-user-extensional-map "6"
    7.20 -  '(lambda () (interactive) (YaTeX-make-section nil nil nil "subparagraph")))
    7.21 -(define-key YaTeX-user-extensional-map "r"
    7.22 -  '(lambda () (interactive) (YaTeX-make-section nil nil nil "ref")))
    7.23 -(define-key YaTeX-user-extensional-map "i"
    7.24 -  '(lambda () (interactive) (YaTeX-make-singlecmd "item")))
    7.25 -(define-key YaTeX-user-extensional-map "\C-b"
    7.26 -  '(lambda () (interactive) (YaTeX-make-singlecmd "leftarrow")))
    7.27 -(define-key YaTeX-user-extensional-map "l"
    7.28 -  '(lambda () (interactive) (YaTeX-make-section nil nil nil "label")))
    7.29 -(define-key YaTeX-user-extensional-map "f"
    7.30 -  '(lambda () (interactive) (YaTeX-make-section nil nil nil "frac")))
    7.31 -(define-key YaTeX-user-extensional-map "S"
    7.32 -  '(lambda () (interactive) (YaTeX-make-section nil nil nil "setlength")))
    7.33 -(define-key YaTeX-user-extensional-map "b"
    7.34 -  '(lambda () (interactive) (YaTeX-make-fontsize nil "bf")))
    7.35 -(define-key YaTeX-user-extensional-map "I" 'YaTeX-browse-info)
    7.36 +(let ((map YaTeX-user-extensional-map))
    7.37 +  (define-key map "0"
    7.38 +    (function (lambda () (interactive)
    7.39 +		(YaTeX-make-section nil nil nil "part"))))
    7.40 +  (define-key map "1"
    7.41 +    (function (lambda () (interactive)
    7.42 +		(YaTeX-make-section nil nil nil "chapter"))))
    7.43 +  (define-key map "2"
    7.44 +    (function (lambda () (interactive)
    7.45 +		(YaTeX-make-section nil nil nil "section"))))
    7.46 +  (define-key map "3"
    7.47 +    (function (lambda () (interactive)
    7.48 +		(YaTeX-make-section nil nil nil "subsection"))))
    7.49 +  (define-key map "4"
    7.50 +    (function (lambda () (interactive)
    7.51 +		(YaTeX-make-section nil nil nil "subsubsection"))))
    7.52 +  (define-key map "5"
    7.53 +    (function (lambda () (interactive)
    7.54 +		(YaTeX-make-section nil nil nil "paragraph"))))
    7.55 +  (define-key map "6"
    7.56 +    (function (lambda () (interactive)
    7.57 +		(YaTeX-make-section nil nil nil "subparagraph"))))
    7.58 +  (define-key map "r"
    7.59 +    (function (lambda () (interactive)
    7.60 +		(YaTeX-make-section nil nil nil "ref"))))
    7.61 +  (define-key map "i"
    7.62 +    (function (lambda () (interactive)
    7.63 +		(YaTeX-make-singlecmd "item"))))
    7.64 +  (define-key map "\C-b"
    7.65 +    (function (lambda () (interactive)
    7.66 +		(YaTeX-make-singlecmd "leftarrow"))))
    7.67 +  (define-key map "l"
    7.68 +    (function (lambda () (interactive)
    7.69 +		(YaTeX-make-section nil nil nil "label"))))
    7.70 +  (define-key map "f"
    7.71 +    (function (lambda () (interactive)
    7.72 +		(YaTeX-make-section nil nil nil "frac"))))
    7.73 +  (define-key map "S"
    7.74 +    (function (lambda () (interactive)
    7.75 +		(YaTeX-make-section nil nil nil "setlength"))))
    7.76 +  (define-key map "b"
    7.77 +    (function (lambda () (interactive)
    7.78 +		(YaTeX-make-fontsize nil "bf"))))
    7.79 +  (define-key map "I" 'YaTeX-browse-info))
    7.80  
    7.81  (defun YaTeX-browse-info ()
    7.82 -  "Browse YaTeX's info"
    7.83 -  (interactive)
    7.84 -  (require 'info)
    7.85 -  (Info-goto-node (if YaTeX-japan "(yatexj)Top" "(yatexe)Top")))
    7.86 + "Browse YaTeX's info"
    7.87 + (interactive)
    7.88 + (require 'info)
    7.89 + (Info-goto-node (if YaTeX-japan "(yatexj)Top" "(yatexe)Top")))
    7.90  
    7.91  
    7.92  ;
     8.1 --- a/yatexhlp.el	Sun Dec 21 13:57:27 2014 +0900
     8.2 +++ b/yatexhlp.el	Sun Dec 21 14:20:01 2014 +0900
     8.3 @@ -1,7 +1,7 @@
     8.4  ;;; yatexhlp.el --- YaTeX helper with LaTeX commands and macros
     8.5  ;;; 
     8.6 -;;; (c)1994,1998,2004 by HIROSE Yuuji.[yuuji@yatex.org]
     8.7 -;;; Last modified Thu Dec 18 17:53:52 2014 on firestorm
     8.8 +;;; (c)1994,1998,2004,2014 by HIROSE Yuuji.[yuuji@yatex.org]
     8.9 +;;; Last modified Sun Dec 21 14:14:34 2014 on firestorm
    8.10  ;;; $Id$
    8.11  
    8.12  ;;; Code:
    8.13 @@ -45,8 +45,8 @@
    8.14    (setq YaTeX-help-mode-map (make-sparse-keymap))
    8.15    (let ((map YaTeX-help-mode-map))
    8.16      (suppress-keymap map)
    8.17 -    (define-key map "j" '(lambda () (interactive) (scroll-up 1)))
    8.18 -    (define-key map "k" '(lambda () (interactive) (scroll-up -1)))
    8.19 +    (define-key map "j" (function (lambda () (interactive) (scroll-up 1))))
    8.20 +    (define-key map "k" (function (lambda () (interactive) (scroll-up -1))))
    8.21      (define-key map "n" 'next-line)
    8.22      (define-key map "p" 'previous-line)
    8.23      (define-key map " " 'scroll-up)
     9.1 --- a/yatexlib.el	Sun Dec 21 13:57:27 2014 +0900
     9.2 +++ b/yatexlib.el	Sun Dec 21 14:20:01 2014 +0900
     9.3 @@ -1,7 +1,7 @@
     9.4  ;;; yatexlib.el --- YaTeX and yahtml common libraries
     9.5  ;;; 
     9.6  ;;; (c)1994-2013 by HIROSE Yuuji.[yuuji@yatex.org]
     9.7 -;;; Last modified Fri Nov 22 07:53:13 2013 on firestorm
     9.8 +;;; Last modified Sun Dec 21 14:15:24 2014 on firestorm
     9.9  ;;; $Id$
    9.10  
    9.11  ;;; Code:
    9.12 @@ -287,8 +287,8 @@
    9.13        (delete-region (point) (progn (forward-sexp) (point)))
    9.14        (delete-blank-lines)
    9.15        (insert "(setq " name " '(\n")
    9.16 -      (mapcar '(lambda (s)
    9.17 -		 (insert (format "%s\n" (prin1-to-string s))))
    9.18 +      (mapcar (function (lambda (s)
    9.19 +			  (insert (format "%s\n" (prin1-to-string s)))))
    9.20  	      value)
    9.21        (insert "))\n\n")
    9.22        (delete-blank-lines)
    9.23 @@ -844,9 +844,9 @@
    9.24  (fset 'YaTeX-last-key
    9.25        (if (fboundp 'win:last-key)
    9.26  	  'win:last-key
    9.27 -	'(lambda () (if (boundp 'last-command-char)
    9.28 -			last-command-char
    9.29 -		      last-command-event))))
    9.30 +	(function (lambda () (if (boundp 'last-command-char)
    9.31 +				 last-command-char
    9.32 +			       last-command-event)))))
    9.33  (defun YaTeX-switch-to-window ()
    9.34    "Switch to windows.el's window decided by last pressed key."
    9.35    (interactive)
    10.1 --- a/yatexm-o.el	Sun Dec 21 13:57:27 2014 +0900
    10.2 +++ b/yatexm-o.el	Sun Dec 21 14:20:01 2014 +0900
    10.3 @@ -1,7 +1,7 @@
    10.4  ;;; yatexm-o.el --- Sample to invoke yatex-mode with outline-minor mode
    10.5  
    10.6  ;;; (c)1993 by HIROSE Yuuji [yuuji@yatex.org]
    10.7 -;;; Last modified Sat Sep  1 08:12:40 2012 on firestorm
    10.8 +;;; Last modified Sun Dec 21 14:15:47 2014 on firestorm
    10.9  
   10.10  ;;; Code:
   10.11  ;;;
   10.12 @@ -26,12 +26,14 @@
   10.13  (autoload 'yatex-mode "yatex" "Yet Another LaTeX mode" t)
   10.14  ;;↓min-outを使用しない場合、;;@ の行は不要です。
   10.15  (defvar yatex-mode-hook
   10.16 -  '(lambda ()
   10.17 +  (function
   10.18 +   (lambda ()
   10.19       (setq outline-regexp LaTeX-outline-regexp)			    ;;@
   10.20       (outline-minor-mode 1)					    ;;@
   10.21 -     ))
   10.22 +     )))
   10.23  (defvar yatex-mode-load-hook
   10.24 -  '(lambda ()
   10.25 +  (function
   10.26 +   (lambda ()
   10.27       (setq-default outline-prefix-char (concat YaTeX-prefix "\C-o"));;@
   10.28       (require 'min-out)						    ;;@
   10.29       ;;auctex 付属の min-out.el の場合これ↓
   10.30 @@ -39,4 +41,4 @@
   10.31       ;;Emacs 付属の outline.el の場合これ↓
   10.32       (define-key outline-mode-prefix-map "\C-?" 'hide-subtree)
   10.33       (YaTeX-define-begend-key "ba" "abstract")
   10.34 -     ))
   10.35 +     )))
    11.1 --- a/yatexpkg.el	Sun Dec 21 13:57:27 2014 +0900
    11.2 +++ b/yatexpkg.el	Sun Dec 21 14:20:01 2014 +0900
    11.3 @@ -1,7 +1,7 @@
    11.4  ;;; yatexpkg.el --- YaTeX package manager
    11.5  ;;; 
    11.6  ;;; (c)2003-2014 by HIROSE, Yuuji [yuuji@yatex.org]
    11.7 -;;; Last modified Thu Dec 18 18:03:48 2014 on firestorm
    11.8 +;;; Last modified Sun Dec 21 14:16:14 2014 on firestorm
    11.9  ;;; $Id$
   11.10  
   11.11  ;;; Code:
   11.12 @@ -128,9 +128,10 @@
   11.13  	(usepkgrx (concat
   11.14  		   YaTeX-ec-regexp
   11.15  		   "\\(usepackage\\|include\\)\\b"))
   11.16 -	(register '(lambda () (set-buffer cb)
   11.17 +	(register (function
   11.18 +		   (lambda () (set-buffer cb)
   11.19  		     (set (make-local-variable 'YaTeX-package-resolved-list)
   11.20 -			  (cons macro YaTeX-package-resolved-list))))
   11.21 +			  (cons macro YaTeX-package-resolved-list)))))
   11.22  	(begdoc (concat YaTeX-ec "begin{document}"))
   11.23  	pb pkg optlist (option "") mb0 uspkgargs)
   11.24      (if (or (YaTeX-member macro YaTeX-package-resolved-list)
    12.1 --- a/yatexsec.el	Sun Dec 21 13:57:27 2014 +0900
    12.2 +++ b/yatexsec.el	Sun Dec 21 14:20:01 2014 +0900
    12.3 @@ -1,7 +1,7 @@
    12.4  ;;; yatexsec.el --- YaTeX sectioning browser
    12.5  ;;; 
    12.6  ;;; (c) 1994-2013 by HIROSE Yuuji [yuuji@yatex.org]
    12.7 -;;; Last modified Mon Apr  1 22:46:28 2013 on firestorm
    12.8 +;;; Last modified Sun Dec 21 14:16:35 2014 on firestorm
    12.9  ;;; $Id$
   12.10  
   12.11  ;;; Code:
   12.12 @@ -55,9 +55,9 @@
   12.13    (define-key YaTeX-sectioning-minibuffer-map "\C-r"
   12.14      'YaTeX-sectioning-scroll-down)
   12.15    (define-key YaTeX-sectioning-minibuffer-map "\C-w"
   12.16 -    '(lambda () (interactive) (YaTeX-sectioning-scroll-down 1)))
   12.17 +    (function (lambda () (interactive) (YaTeX-sectioning-scroll-down 1))))
   12.18    (define-key YaTeX-sectioning-minibuffer-map "\C-z"
   12.19 -    '(lambda () (interactive) (YaTeX-sectioning-scroll-up 1)))
   12.20 +    (function (lambda () (interactive) (YaTeX-sectioning-scroll-up 1))))
   12.21    (define-key YaTeX-sectioning-minibuffer-map "\C-l"
   12.22      'YaTeX-sectioning-recenter)
   12.23    (define-key YaTeX-sectioning-minibuffer-map "?"