1.1 --- a/yahtml.el	Tue Dec 16 11:12:38 2014 +0900
     1.2 +++ b/yahtml.el	Mon Dec 22 00:01:30 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