rpms/emacs/devel mule-cmd.el-X11-locale.alias-173781.patch, NONE, 1.1 emacs.spec, 1.61, 1.62 php-mode-init.el, 1.3, 1.4
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Feb 3 08:26:11 UTC 2006
Author: petersen
Update of /cvs/dist/rpms/emacs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32317
Modified Files:
emacs.spec php-mode-init.el
Added Files:
mule-cmd.el-X11-locale.alias-173781.patch
Log Message:
- add mule-cmd.el-X11-locale.alias-173781.patch to correct location of X11
locale.alias file (Paul Dickson, #173781)
- fix autoload of php-mode in php-mode-init.el (Christopher Beland, #179484)
mule-cmd.el-X11-locale.alias-173781.patch:
mule-cmds.el | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE mule-cmd.el-X11-locale.alias-173781.patch ---
diff -u emacs-21.4/lisp/international/mule-cmds.el~ emacs-21.4/lisp/international/mule-cmds.el
--- emacs-21.4/lisp/international/mule-cmds.el~ 2006-02-03 15:00:06.000000000 +0900
+++ emacs-21.4/lisp/international/mule-cmds.el 2006-02-03 15:00:06.000000000 +0900
@@ -1889,7 +1889,8 @@
;; to a system without X.
(setq locale-translation-file-name
(let ((files
- '("/usr/lib/X11/locale/locale.alias" ; e.g. X11R6.4
+ '("/usr/share/X11/locale/locale.alias" ; e.g. X11R7
+ "/usr/lib/X11/locale/locale.alias" ; e.g. X11R6.4
"/usr/X11R6/lib/X11/locale/locale.alias" ; e.g. RedHat 4.2
"/usr/openwin/lib/locale/locale.alias" ; e.g. Solaris 2.6
;;
Index: emacs.spec
===================================================================
RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- emacs.spec 14 Dec 2005 08:23:54 -0000 1.61
+++ emacs.spec 3 Feb 2006 08:26:08 -0000 1.62
@@ -11,7 +11,7 @@
Summary: GNU Emacs text editor
Name: emacs
Version: 21.4
-Release: 11
+Release: 12
License: GPL
URL: http://www.gnu.org/software/emacs/
Group: Applications/Editors
@@ -125,6 +125,7 @@
Patch122: save-buffer.dpatch
Patch123: smtpmail-cvs-update.patch
%endif
+Patch124: mule-cmd.el-X11-locale.alias-173781.patch
%description
Emacs is a powerful, customizable, self-documenting, modeless text
@@ -261,6 +262,8 @@
# smtpmail update
%patch123 -p1
%endif
+# locale.alias path
+%patch124 -p1
# install rest of site-lisp files
( cd site-lisp
@@ -535,6 +538,11 @@
%endif
%changelog
+* Fri Feb 3 2006 Jens Petersen <petersen at redhat.com> - 21.4-12
+- add mule-cmd.el-X11-locale.alias-173781.patch to correct location of X11
+ locale.alias file (Paul Dickson, #173781)
+- fix autoload of php-mode in php-mode-init.el (Christopher Beland, #179484)
+
* Wed Dec 14 2005 Jens Petersen <petersen at redhat.com> - 21.4-11
- avoid building with -fstack-protector on i386 to prevent crashing
(Jonathan Kamens, #174730)
Index: php-mode-init.el
===================================================================
RCS file: /cvs/dist/rpms/emacs/devel/php-mode-init.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-mode-init.el 9 Sep 2004 04:35:28 -0000 1.3
+++ php-mode-init.el 3 Feb 2006 08:26:08 -0000 1.4
@@ -1,6 +1,7 @@
;; Use php-mode for .php,.php3,.php4 and .phtml files
-(autoload 'php-mode "php-mode")
+(autoload 'php-mode "php-mode" "Major mode for editing PHP code." t)
+
(add-to-list 'auto-mode-alist
'("\\.php[34]\\'\\|\\.php\\'\\|\\.phtml\\'" . php-mode))
More information about the fedora-cvs-commits
mailing list