January 2013 - XEmacs-Patches - XEmacs Mailing List Archives

commit/tramp: albinus: * Makefile (EXTRA_SOURCES): Add lisp/tramp-loaddefs.el. 11 years, 2 months

Bitbucket

1 new commit in tramp: https://bitbucket.org/xemacs/tramp/commits/1139b513b590/ changeset: 1139b513b590 user: albinus date: 2013-01-28 17:14:20 summary: * Makefile (EXTRA_SOURCES): Add lisp/tramp-loaddefs.el. affected #: 2 files diff -r ae237be31522a1c37a9ecaf8bde6179fb5e96ebe -r 1139b513b590b4532982538c4f3f03ee275496e6 ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -1,3 +1,7 ＠＠ +2013-01-28 Michael Albinus <michael.albinus(a)gmx.de> + + * Makefile (EXTRA_SOURCES): Add lisp/tramp-loaddefs.el. + 2013-01-27 Norbert Koch <viteno(a)xemacs.org> * Makefile (VERSION): XEmacs package 1.41 released. diff -r ae237be31522a1c37a9ecaf8bde6179fb5e96ebe -r 1139b513b590b4532982538c4f3f03ee275496e6 Makefile --- a/Makefile +++ b/Makefile ＠＠ -31,7 +31,7 ＠＠ lisp/tramp-cmds.elc lisp/tramp-compat.elc lisp/tramp-efs.elc \ lisp/tramp-sh.elc lisp/tramp-smb.elc lisp/tramp-uu.elc lisp/trampver.elc -EXTRA_SOURCES = ChangeLog.upstream +EXTRA_SOURCES = ChangeLog.upstream lisp/tramp-loaddefs.el EXPLICIT_DOCS = texi/$(PACKAGE).texi MAKEINFO_FLAGS = --footnote-style=end -D xemacs Repository URL: https://bitbucket.org/xemacs/tramp/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

commit/xemacs-packages: 3 new changesets 11 years, 2 months

Bitbucket

3 new commits in xemacs-packages: https://bitbucket.org/xemacs/xemacs-packages/commits/c2570af3e412/ changeset: c2570af3e412 user: Norbert Koch date: 2013-01-27 21:38:05 summary: Update packages affected #: 1 file diff -r 24c607a533efbeb5e37a1c8a1c5939e857f99605 -r c2570af3e4129eddfcbdf4e63cf9c6e674bc3861 .hgsubstate --- a/.hgsubstate +++ b/.hgsubstate ＠＠ -17,7 +17,7 ＠＠ da4e7d4a51c502e5ac05a224cb756f382f0ba4d7 xemacs-packages/c-support 11074b3808d1e349f3fddb3c4d50f8be7c0f859e xemacs-packages/calc 7524e4fb9de45d77812090a724fac4ebd7549d6e xemacs-packages/calendar -f6902f2bba329c59fd05e95b373de9d83fdc79c2 xemacs-packages/cc-mode +b2040e9e8639d7627612339d0b8693c24c6899b6 xemacs-packages/cc-mode a7ae1cfb2376bcd32617c1c88afe08872b11d298 xemacs-packages/cedet-common 87dd21fac17ea98219267b1378b4696698d6c4ff xemacs-packages/clearcase e18acdbfcd36295d052cd56fa2e6d78c68b4b7d4 xemacs-packages/cogre ＠＠ -32,7 +32,7 ＠＠ 4d69167f82f3772a4c58a09e037f0abf5b6a0a0d xemacs-packages/ecrypto 5200706cfcb56eeefed3d21d8f63f32dd491ca85 xemacs-packages/ede 7f290f0c522c3031e9101047df3949d87789de35 xemacs-packages/edebug -e574c28af4793c5c3d4c3c3e8fa9a13d3f250f74 xemacs-packages/ediff +bdbc67c1c9274ef68f98be379e96453baea8f72d xemacs-packages/ediff c9695dbffbdf51ca205fb3316867a14392513d1f xemacs-packages/edit-utils 94f1da97c08e96f1bf1fd5a255934956e6a37a05 xemacs-packages/edt 73360c2969ec1e3ae896760611d0a4d4be823cf0 xemacs-packages/efs ＠＠ -79,7 +79,7 ＠＠ 89f88d5db0a8af3b2751c90ca5d43bf9cf27dad8 xemacs-packages/os-utils 86f4cd2b333b893910a961f7311bf63126a5f152 xemacs-packages/patcher 7a04c241f47185ce3284c2760a9dc426a9657958 xemacs-packages/pc -edc81e85ee70ea6fe14a3a7e7bb79c0ecdf10b78 xemacs-packages/pcl-cvs +b93ade192ae4508c8aafefc9b36ec25265b11337 xemacs-packages/pcl-cvs bb764ada03558fbbb5453138c6437513fdea84bf xemacs-packages/pcomplete be87a7f039ffe86a1129c8e37633de2d45c484c5 xemacs-packages/perl-modes f937cd3de668adac94e4969c606c6bb90c750ac0 xemacs-packages/pgg ＠＠ -114,7 +114,7 ＠＠ 497e37ee09551c8615a6b7f06cb91025815d10c3 xemacs-packages/tm c654835e16b425c0c23c0ee742549346333b0942 xemacs-packages/tooltalk e534e0dbe77a33527a3c5cb25f629a0cf10c5ccd xemacs-packages/tpu -5f12f8ed1be9e4a757238c9b57a02f99b17b86fa xemacs-packages/tramp +9888b23060f7275c2a6df865931c34ef868eb5fb xemacs-packages/tramp d144e4a87a6d666a221b9c6bc6fd8b4cb9dc5bc5 xemacs-packages/vc b2da4055175dbe90cda50d34d666fd4931dfa200 xemacs-packages/vc-cc c4dafa4f318d98b34f6e54e9424dc3f53767ece5 xemacs-packages/vhdl https://bitbucket.org/xemacs/xemacs-packages/commits/b8b615548a12/ changeset: b8b615548a12 user: Norbert Koch date: 2013-01-27 21:39:09 summary: XEmacs Package Release affected #: 1 file diff -r c2570af3e4129eddfcbdf4e63cf9c6e674bc3861 -r b8b615548a12e475ff5db98d65eb0bd475f8c9a9 ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -1,3 +1,7 ＠＠ +2013-01-27 Norbert Koch <viteno(a)xemacs.org> + + * Packages released: cc-mode, ediff, pcl-cvs, tramp. + 2012-12-28 Norbert Koch <viteno(a)xemacs.org> * Packages released: cc-mode. https://bitbucket.org/xemacs/xemacs-packages/commits/58211a8b2e04/ changeset: 58211a8b2e04 user: Norbert Koch date: 2013-01-27 22:04:39 summary: Pre-release latest changes affected #: 1 file diff -r b8b615548a12e475ff5db98d65eb0bd475f8c9a9 -r 58211a8b2e04d38f50345b39737b759533ee8984 .hgsubstate --- a/.hgsubstate +++ b/.hgsubstate ＠＠ -17,7 +17,7 ＠＠ da4e7d4a51c502e5ac05a224cb756f382f0ba4d7 xemacs-packages/c-support 11074b3808d1e349f3fddb3c4d50f8be7c0f859e xemacs-packages/calc 7524e4fb9de45d77812090a724fac4ebd7549d6e xemacs-packages/calendar -b2040e9e8639d7627612339d0b8693c24c6899b6 xemacs-packages/cc-mode +954d53682930bce3e4c3ef249c34985586b3c927 xemacs-packages/cc-mode a7ae1cfb2376bcd32617c1c88afe08872b11d298 xemacs-packages/cedet-common 87dd21fac17ea98219267b1378b4696698d6c4ff xemacs-packages/clearcase e18acdbfcd36295d052cd56fa2e6d78c68b4b7d4 xemacs-packages/cogre ＠＠ -32,7 +32,7 ＠＠ 4d69167f82f3772a4c58a09e037f0abf5b6a0a0d xemacs-packages/ecrypto 5200706cfcb56eeefed3d21d8f63f32dd491ca85 xemacs-packages/ede 7f290f0c522c3031e9101047df3949d87789de35 xemacs-packages/edebug -bdbc67c1c9274ef68f98be379e96453baea8f72d xemacs-packages/ediff +68569d2f5904bfc32cc5f9beececfb6e56b6f152 xemacs-packages/ediff c9695dbffbdf51ca205fb3316867a14392513d1f xemacs-packages/edit-utils 94f1da97c08e96f1bf1fd5a255934956e6a37a05 xemacs-packages/edt 73360c2969ec1e3ae896760611d0a4d4be823cf0 xemacs-packages/efs ＠＠ -79,7 +79,7 ＠＠ 89f88d5db0a8af3b2751c90ca5d43bf9cf27dad8 xemacs-packages/os-utils 86f4cd2b333b893910a961f7311bf63126a5f152 xemacs-packages/patcher 7a04c241f47185ce3284c2760a9dc426a9657958 xemacs-packages/pc -b93ade192ae4508c8aafefc9b36ec25265b11337 xemacs-packages/pcl-cvs +608918670e3d6936ffa06ecefff8f76251d74a98 xemacs-packages/pcl-cvs bb764ada03558fbbb5453138c6437513fdea84bf xemacs-packages/pcomplete be87a7f039ffe86a1129c8e37633de2d45c484c5 xemacs-packages/perl-modes f937cd3de668adac94e4969c606c6bb90c750ac0 xemacs-packages/pgg ＠＠ -114,7 +114,7 ＠＠ 497e37ee09551c8615a6b7f06cb91025815d10c3 xemacs-packages/tm c654835e16b425c0c23c0ee742549346333b0942 xemacs-packages/tooltalk e534e0dbe77a33527a3c5cb25f629a0cf10c5ccd xemacs-packages/tpu -9888b23060f7275c2a6df865931c34ef868eb5fb xemacs-packages/tramp +ae237be31522a1c37a9ecaf8bde6179fb5e96ebe xemacs-packages/tramp d144e4a87a6d666a221b9c6bc6fd8b4cb9dc5bc5 xemacs-packages/vc b2da4055175dbe90cda50d34d666fd4931dfa200 xemacs-packages/vc-cc c4dafa4f318d98b34f6e54e9424dc3f53767ece5 xemacs-packages/vhdl Repository URL: https://bitbucket.org/xemacs/xemacs-packages/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

commit/tramp: 2 new changesets 11 years, 2 months

Bitbucket

2 new commits in tramp: https://bitbucket.org/xemacs/tramp/commits/d799683afe56/ changeset: d799683afe56 user: Norbert Koch date: 2013-01-27 21:39:08 summary: XEmacs Package Release 1.41 affected #: 2 files diff -r 9888b23060f7275c2a6df865931c34ef868eb5fb -r d799683afe56649f2c6ed51a91cfe7243d1380b7 ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -1,3 +1,7 ＠＠ +2013-01-27 Norbert Koch <viteno(a)xemacs.org> + + * Makefile (VERSION): XEmacs package 1.41 released. + 2013-01-23 Michael Albinus <michael.albinus(a)gmx.de> * lisp/tramp-loaddefs.el: Remove entries for tramp-ftp, tramp-gvfs diff -r 9888b23060f7275c2a6df865931c34ef868eb5fb -r d799683afe56649f2c6ed51a91cfe7243d1380b7 Makefile --- a/Makefile +++ b/Makefile ＠＠ -17,7 +17,7 ＠＠ # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -VERSION = 1.40 +VERSION = 1.41 AUTHOR_VERSION = 2.2.7-pre MAINTAINER = Michael Albinus <michael.albinus(a)gmx.de> PACKAGE = tramp https://bitbucket.org/xemacs/tramp/commits/ae237be31522/ changeset: ae237be31522 user: Norbert Koch date: 2013-01-27 21:39:08 summary: Added tag tramp-1_41 for changeset d799683afe56 affected #: 1 file diff -r d799683afe56649f2c6ed51a91cfe7243d1380b7 -r ae237be31522a1c37a9ecaf8bde6179fb5e96ebe .hgtags --- a/.hgtags +++ b/.hgtags ＠＠ -73,3 +73,4 ＠＠ 1df4823bd2adbc70f0037b19e6c7f429fc2f8b71 tramp-1_18 3649d19b9dd5377933671478e774c6b9d9b2bb91 tramp-1_19 8c1f99d0ac238bf8c0ef83d4bae80649cfa8bbfc sumo-2007-04-27 +d799683afe56649f2c6ed51a91cfe7243d1380b7 tramp-1_41 Repository URL: https://bitbucket.org/xemacs/tramp/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

commit/pcl-cvs: 2 new changesets 11 years, 2 months

Bitbucket

2 new commits in pcl-cvs: https://bitbucket.org/xemacs/pcl-cvs/commits/c17b8897b84c/ changeset: c17b8897b84c user: Norbert Koch date: 2013-01-27 21:38:58 summary: XEmacs Package Release 1.71 affected #: 2 files diff -r b93ade192ae4508c8aafefc9b36ec25265b11337 -r c17b8897b84c846647af67d3c96fae645bd82d44 ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -1,3 +1,7 ＠＠ +2013-01-27 Norbert Koch <viteno(a)xemacs.org> + + * Makefile (VERSION): XEmacs package 1.71 released. + 2013-01-21 Vin Shelton <acs(a)xemacs.org> * Makefile (REQUIRES): New tramp update requires sh-script. diff -r b93ade192ae4508c8aafefc9b36ec25265b11337 -r c17b8897b84c846647af67d3c96fae645bd82d44 Makefile --- a/Makefile +++ b/Makefile ＠＠ -17,7 +17,7 ＠＠ # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -VERSION = 1.70 +VERSION = 1.71 AUTHOR_VERSION = R-2_9_9 MAINTAINER = XEmacs Development Team <xemacs-beta(a)xemacs.org> PACKAGE = pcl-cvs https://bitbucket.org/xemacs/pcl-cvs/commits/608918670e3d/ changeset: 608918670e3d user: Norbert Koch date: 2013-01-27 21:38:58 summary: Added tag pcl-cvs-1_71 for changeset c17b8897b84c affected #: 1 file diff -r c17b8897b84c846647af67d3c96fae645bd82d44 -r 608918670e3d6936ffa06ecefff8f76251d74a98 .hgtags --- a/.hgtags +++ b/.hgtags ＠＠ -84,3 +84,4 ＠＠ 647eb2cb893569177b90429a2eeaee6d7a51ad08 xemacs-sumo-2001-07-08 f9e443ea12bbbc2ccc93a985007a307ed47b6ebd sumo-2003-02-05 da6564ad6d1e830c9c64e49659080e71371d7ca6 sumo-2006-05-10 +c17b8897b84c846647af67d3c96fae645bd82d44 pcl-cvs-1_71 Repository URL: https://bitbucket.org/xemacs/pcl-cvs/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

commit/ediff: 2 new changesets 11 years, 2 months

Bitbucket

2 new commits in ediff: https://bitbucket.org/xemacs/ediff/commits/a24f10b22900/ changeset: a24f10b22900 user: Norbert Koch date: 2013-01-27 21:38:54 summary: XEmacs Package Release 1.82 affected #: 2 files diff -r bdbc67c1c9274ef68f98be379e96453baea8f72d -r a24f10b22900f508518263c33b213457ebe0e90a ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -1,3 +1,7 ＠＠ +2013-01-27 Norbert Koch <viteno(a)xemacs.org> + + * Makefile (VERSION): XEmacs package 1.82 released. + 2013-01-21 Vin Shelton <acs(a)xemacs.org> * Makefile (REQUIRES): New tramp update requires sh-script. diff -r bdbc67c1c9274ef68f98be379e96453baea8f72d -r a24f10b22900f508518263c33b213457ebe0e90a Makefile --- a/Makefile +++ b/Makefile ＠＠ -17,7 +17,7 ＠＠ # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -VERSION = 1.81 +VERSION = 1.82 AUTHOR_VERSION = 2.75 MAINTAINER = Michael Kifer <kifer(a)cs.sunysb.edu> PACKAGE = ediff https://bitbucket.org/xemacs/ediff/commits/68569d2f5904/ changeset: 68569d2f5904 user: Norbert Koch date: 2013-01-27 21:38:54 summary: Added tag ediff-1_82 for changeset a24f10b22900 affected #: 1 file diff -r a24f10b22900f508518263c33b213457ebe0e90a -r 68569d2f5904bfc32cc5f9beececfb6e56b6f152 .hgtags --- a/.hgtags +++ b/.hgtags ＠＠ -109,3 +109,4 ＠＠ cb6cc7f7334b18a159c7e025f121f6b1766c38f8 ediff-1_57 1e2182100aa3c6494d5299958329993875a98edc sumo-2003-02-05 ff95a843d9787713df8f80f8703ca13ea934f93a sumo-2006-05-10 +a24f10b22900f508518263c33b213457ebe0e90a ediff-1_82 Repository URL: https://bitbucket.org/xemacs/ediff/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

commit/cc-mode: 2 new changesets 11 years, 2 months

Bitbucket

2 new commits in cc-mode: https://bitbucket.org/xemacs/cc-mode/commits/84035315a6ee/ changeset: 84035315a6ee user: Norbert Koch date: 2013-01-27 21:38:48 summary: XEmacs Package Release 1.60 affected #: 2 files diff -r b2040e9e8639d7627612339d0b8693c24c6899b6 -r 84035315a6ee61c74a5ebd43dab790318c1cc9a3 ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -1,3 +1,7 ＠＠ +2013-01-27 Norbert Koch <viteno(a)xemacs.org> + + * Makefile (VERSION): XEmacs package 1.60 released. + 2012-12-28 Norbert Koch <viteno(a)xemacs.org> * Makefile (VERSION): XEmacs package 1.59 released. diff -r b2040e9e8639d7627612339d0b8693c24c6899b6 -r 84035315a6ee61c74a5ebd43dab790318c1cc9a3 Makefile --- a/Makefile +++ b/Makefile ＠＠ -17,7 +17,7 ＠＠ # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -VERSION = 1.59 +VERSION = 1.60 AUTHOR_VERSION = 5.32.2 MAINTAINER = Alan Mackenzie <bug-cc-mode(a)gnu.org> PACKAGE = cc-mode https://bitbucket.org/xemacs/cc-mode/commits/954d53682930/ changeset: 954d53682930 user: Norbert Koch date: 2013-01-27 21:38:48 summary: Added tag cc-mode-1_60 for changeset 84035315a6ee affected #: 1 file diff -r 84035315a6ee61c74a5ebd43dab790318c1cc9a3 -r 954d53682930bce3e4c3ef249c34985586b3c927 .hgtags --- a/.hgtags +++ b/.hgtags ＠＠ -92,3 +92,4 ＠＠ a9aff1813e2a4aa3d8af1ae40b69bcaf033f7905 cc-mode-1_57 46f8e9f7f8174bdf529daf1577892b212c566d5b cc-mode-1_58 c325532f7d0bbf9c4cae63da83d12abf2033c6b5 cc-mode-1_59 +84035315a6ee61c74a5ebd43dab790318c1cc9a3 cc-mode-1_60 Repository URL: https://bitbucket.org/xemacs/cc-mode/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

commit/cc-mode: acm: AWK Mode: Fix indentation bug at top level. 11 years, 3 months

Bitbucket

1 new commit in cc-mode: https://bitbucket.org/xemacs/cc-mode/commits/b2040e9e8639/ changeset: b2040e9e8639 user: acm date: 2013-01-25 19:59:03 summary: AWK Mode: Fix indentation bug at top level. cc-engine.el (c-guess-basic-syntax): Move CASE 5P to just before CASE 5D. awk-top-1.{awk,res}. Add an extra test for this. affected #: 1 file diff -r ab14083fb88217935183632e788c6fa5e20adb8d -r b2040e9e8639d7627612339d0b8693c24c6899b6 cc-engine.el --- a/cc-engine.el +++ b/cc-engine.el ＠＠ -9880,6 +9880,18 ＠＠ ;; contains any class offset ))) + ;; CASE 5P: AWK pattern or function or continuation + ;; thereof. + ((c-major-mode-is 'awk-mode) + (setq placeholder (point)) + (c-add-stmt-syntax + (if (and (eq (c-beginning-of-statement-1) 'same) + (/= (point) placeholder)) + 'topmost-intro-cont + 'topmost-intro) + nil nil + containing-sexp paren-state)) + ;; CASE 5D: this could be a top-level initialization, a ;; member init list continuation, or a template argument ;; list continuation. ＠＠ -10039,18 +10051,6 ＠＠ (goto-char (point-min))) (c-add-syntax 'objc-method-intro (c-point 'boi))) - ;; CASE 5P: AWK pattern or function or continuation - ;; thereof. - ((c-major-mode-is 'awk-mode) - (setq placeholder (point)) - (c-add-stmt-syntax - (if (and (eq (c-beginning-of-statement-1) 'same) - (/= (point) placeholder)) - 'topmost-intro-cont - 'topmost-intro) - nil nil - containing-sexp paren-state)) - ;; CASE 5N: At a variable declaration that follows a class ;; definition or some other block declaration that doesn't ;; end at the closing '}'. C.f. case 5D.5. Repository URL: https://bitbucket.org/xemacs/cc-mode/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

commit/cc-mode: acm: Fix a bug in the state cache mechanism. Refactor this a bit. 11 years, 3 months

Bitbucket

1 new commit in cc-mode: https://bitbucket.org/xemacs/cc-mode/commits/ab14083fb882/ changeset: ab14083fb882 user: acm date: 2013-01-23 19:16:45 summary: Fix a bug in the state cache mechanism. Refactor this a bit. (c-parse-state-get-strategy): Remove the `cache-pos' element from the return value. (c-append-lower-brace-pair-to-state-cache): "Narrow" to end of buffer to enable proper searching from beyond HERE. Amend the test for detecting the sought brace pair. Amend the value written to the "brace desert cache" when the brace isn't found. (c-remove-stale-state-cache): Rename `good-pos' to `start-point', and several other variables analogously. (c-remove-stale-state-cache-backwards): Change `cache-pos' from a parameter to a locally calculated variable. (c-parse-state-1): Change the calling conventions to the two defuns involving `cache-pos'. affected #: 1 file diff -r 2b353db0dc37b60febfd99f3fbb796f2fd4e24f6 -r ab14083fb88217935183632e788c6fa5e20adb8d cc-engine.el --- a/cc-engine.el +++ b/cc-engine.el ＠＠ -2544,14 +2544,12 ＠＠ ;; ;; The return value is a list, one of the following: ;; - ;; o - ('forward CACHE-POS START-POINT) - scan forward from START-POINT, - ;; which is not less than CACHE-POS. - ;; o - ('backward CACHE-POS nil) - scan backwards (from HERE). - ;; o - ('BOD nil START-POINT) - scan forwards from START-POINT, which is at the + ;; o - ('forward START-POINT) - scan forward from START-POINT, + ;; which is not less than the highest position in `c-state-cache' below here. + ;; o - ('backward nil) - scan backwards (from HERE). + ;; o - ('BOD START-POINT) - scan forwards from START-POINT, which is at the ;; top level. - ;; o - ('IN-LIT nil nil) - point is inside the literal containing point-min. - ;; , where CACHE-POS is the highest position recorded in `c-state-cache' at - ;; or below HERE. + ;; o - ('IN-LIT nil) - point is inside the literal containing point-min. (let ((cache-pos (c-get-cache-scan-pos here)) ; highest position below HERE in cache (or 1) BOD-pos ; position of 2nd BOD before HERE. strategy ; 'forward, 'backward, 'BOD, or 'IN-LIT. ＠＠ -2589,7 +2587,6 ＠＠ (list strategy - (and (memq strategy '(forward backward)) cache-pos) (and (memq strategy '(forward BOD)) start-point)))) ＠＠ -2656,7 +2653,8 ＠＠ ;; reduce the time wasted in repeated fruitless searches in brace deserts. (save-excursion (save-restriction - (let* (new-cons + (let* ((here (point-max)) + new-cons (cache-pos (c-state-cache-top-lparen)) ; might be nil. (macro-start-or-from (progn (goto-char from) ＠＠ -2691,6 +2689,7 ＠＠ ;; search bound, even though the algorithm below would skip ;; over the new paren pair. (cache-lim (and cache-pos (< cache-pos from) cache-pos))) + (widen) (narrow-to-region (cond ((and desert-lim cache-lim) ＠＠ -2710,16 +2709,18 ＠＠ (while (and (setq ce (c-sc-scan-lists bra -1 -1)) ; back past )/]/}; might signal (setq bra (c-sc-scan-lists ce -1 1)) ; back past (/[/{; might signal - (or (> ce upper-lim) - (not (eq (char-after bra) ?\{)) - (and (goto-char bra) - (c-beginning-of-macro) - (< (point) macro-start-or-from)))))) + (or (> bra here) ;(> ce here) + (and + (< ce here) + (or (not (eq (char-after bra) ?\{)) + (and (goto-char bra) + (c-beginning-of-macro) + (< (point) macro-start-or-from)))))))) (and ce (< ce bra))) (setq bra ce)) ; If we just backed over an unbalanced closing ; brace, ignore it. - (if (and ce (< bra ce) (eq (char-after bra) ?\{)) + (if (and ce (< ce here) (< bra ce) (eq (char-after bra) ?\{)) ;; We've found the desired brace-pair. (progn (setq new-cons (cons bra (1+ ce))) ＠＠ -2733,7 +2734,11 ＠＠ (t (setq c-state-cache (cons new-cons c-state-cache))))) ;; We haven't found a brace pair. Record this in the cache. - (setq c-state-brace-pair-desert (cons cache-pos from)))))))) + (setq c-state-brace-pair-desert + (cons (if (and ce (< bra ce) (> ce here)) ; {..} straddling HERE? + bra + (point-min)) + (min here from))))))))) (defsubst c-state-push-any-brace-pair (bra+1 macro-start-or-here) ;; If BRA+1 is nil, do nothing. Otherwise, BRA+1 is the buffer position ＠＠ -2851,17 +2856,17 ＠＠ (paren+1) (t from))))) -(defun c-remove-stale-state-cache (good-pos pps-point) +(defun c-remove-stale-state-cache (start-point pps-point) ;; Remove stale entries from the `c-cache-state', i.e. those which will ;; not be in it when it is amended for position (point-max). ;; Additionally, the "outermost" open-brace entry before (point-max) ;; will be converted to a cons if the matching close-brace is scanned. ;; - ;; GOOD-POS is a "maximal" "safe position" - there must be no open - ;; parens/braces/brackets between GOOD-POS and (point-max). + ;; START-POINT is a "maximal" "safe position" - there must be no open + ;; parens/braces/brackets between START-POINT and (point-max). ;; ;; As a second thing, calculate the result of parse-partial-sexp at - ;; PPS-POINT, w.r.t. GOOD-POS. The motivation here is that + ;; PPS-POINT, w.r.t. START-POINT. The motivation here is that ;; `c-state-cache-good-pos' may become PPS-POINT, but the caller may need to ;; adjust it to get outside a string/comment. (Sorry about this! The code ;; needs to be FAST). ＠＠ -2871,7 +2876,9 ＠＠ ;; to be good (we aim for this to be as high as possible); ;; o - SCAN-BACK-POS, if not nil, indicates there may be a brace pair ;; preceding POS which needs to be recorded in `c-state-cache'. It is a - ;; position to scan backwards from. + ;; position to scan backwards from. It is the position of the "{" of the + ;; last element to be removed from `c-state-cache', when that elt is a + ;; cons, otherwise nil. ;; o - PPS-STATE is the parse-partial-sexp state at PPS-POINT. (save-restriction (narrow-to-region 1 (point-max)) ＠＠ -2881,18 +2888,18 ＠＠ (goto-char (point-max)) (and (c-beginning-of-macro) (point)))) - (good-pos-actual-macro-start ; Start of macro containing good-pos - ; or nil - (and (< good-pos (point-max)) + (start-point-actual-macro-start ; Start of macro containing + ; start-point or nil + (and (< start-point (point-max)) (save-excursion - (goto-char good-pos) + (goto-char start-point) (and (c-beginning-of-macro) (point))))) - (good-pos-actual-macro-end ; End of this macro, (maybe + (start-point-actual-macro-end ; End of this macro, (maybe ; (point-max)), or nil. - (and good-pos-actual-macro-start + (and start-point-actual-macro-start (save-excursion - (goto-char good-pos-actual-macro-start) + (goto-char start-point-actual-macro-start) (c-end-of-macro) (point)))) pps-state ; Will be 9 or 10 elements long. ＠＠ -2926,14 +2933,14 ＠＠ ;; time round; the corresponding elements in `c-state-cache' are ;; removed. `pos' is just after the brace-pair or the open paren at ;; (car c-state-cache). There can be no open parens/braces/brackets - ;; between `good-pos'/`good-pos-actual-macro-start' and (point-max), + ;; between `start-point'/`start-point-actual-macro-start' and (point-max), ;; due to the interface spec to this function. - (setq pos (if (and good-pos-actual-macro-end - (not (eq good-pos-actual-macro-start + (setq pos (if (and start-point-actual-macro-end + (not (eq start-point-actual-macro-start in-macro-start))) - (1+ good-pos-actual-macro-end) ; get outside the macro as + (1+ start-point-actual-macro-end) ; get outside the macro as ; marked by a `category' text property. - good-pos)) + start-point)) (goto-char pos) (while (and c-state-cache (< (point) (point-max))) ＠＠ -2993,14 +3000,14 ＠＠ (list pos scan-back-pos pps-state))))) -(defun c-remove-stale-state-cache-backwards (here cache-pos) +(defun c-remove-stale-state-cache-backwards (here) ;; Strip stale elements of `c-state-cache' by moving backwards through the ;; buffer, and inform the caller of the scenario detected. ;; ;; HERE is the position we're setting `c-state-cache' for. - ;; CACHE-POS is just after the latest recorded position in `c-state-cache' - ;; before HERE, or a position at or near point-min which isn't in a - ;; literal. + ;; CACHE-POS (a locally bound variable) is just after the latest recorded + ;; position in `c-state-cache' before HERE, or a position at or near + ;; point-min which isn't in a literal. ;; ;; This function must only be called only when (> `c-state-cache-good-pos' ;; HERE). Usually the gap between CACHE-POS and HERE is large. It is thus ＠＠ -3026,7 +3033,8 ＠＠ ;; . {..} (..) (..) ( .. { } ) (...) ( .... . ..) ;; | | | | | | ;; CP E here D C good - (let ((pos c-state-cache-good-pos) + (let ((cache-pos (c-get-cache-scan-pos here)) ; highest position below HERE in cache (or 1) + (pos c-state-cache-good-pos) pa ren ; positions of "(" and ")" dropped-cons ; whether the last element dropped from `c-state-cache' ; was a cons (representing a brace-pair) ＠＠ -3266,7 +3274,8 ＠＠ cache-pos ; highest position below HERE already existing in ; cache (or 1). good-pos - start-point + start-point ; (when scanning forward) a place below HERE where there + ; are no open parens/braces between it and HERE. bopl-state res scan-backward-pos scan-forward-p) ; used for 'backward. ＠＠ -3277,8 +3286,7 ＠＠ ;; Strategy? (setq res (c-parse-state-get-strategy here c-state-cache-good-pos) strategy (car res) - cache-pos (cadr res) - start-point (nth 2 res)) + start-point (cadr res)) (when (eq strategy 'BOD) (setq c-state-cache nil ＠＠ -3305,7 +3313,7 ＠＠ good-pos))) ((eq strategy 'backward) - (setq res (c-remove-stale-state-cache-backwards here cache-pos) + (setq res (c-remove-stale-state-cache-backwards here) good-pos (car res) scan-backward-pos (cadr res) scan-forward-p (car (cddr res))) Repository URL: https://bitbucket.org/xemacs/cc-mode/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

commit/XEmacs: Jerry James: Support :visible in menu specifications. 11 years, 3 months

Bitbucket

1 new commit in XEmacs: https://bitbucket.org/xemacs/xemacs/commits/68f8d295be49/ changeset: 68f8d295be49 user: Jerry James date: 2013-01-23 19:48:46 summary: Support :visible in menu specifications. affected #: 12 files diff -r 489e76b8582868ac588551ea0565ef43e695da54 -r 68f8d295be49fb1f37b708c368bb1b2b06dd75c9 lisp/ChangeLog --- a/lisp/ChangeLog +++ b/lisp/ChangeLog ＠＠ -1,3 +1,9 ＠＠ +2013-01-22 Jerry James <james(a)xemacs.org> + + * glyphs.el (make-image-specifier): Document that :visible is a + widget keyword. + * menubar.el (check-menu-syntax): Allow :visible in menu specs. + 2013-01-04 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.33 "horseradish" is released. diff -r 489e76b8582868ac588551ea0565ef43e695da54 -r 68f8d295be49fb1f37b708c368bb1b2b06dd75c9 lisp/glyphs.el --- a/lisp/glyphs.el +++ b/lisp/glyphs.el ＠＠ -266,7 +266,7 ＠＠ \[WIDGET-KEYWORDS] stands for the standard keywords accepted by widgets: These are `:selected', `:active', `:suffix', `:keys', `:style', `:filter', `:config', `:included', `:key-sequence', `:accelerator', -`:label', `:callback', `:initial-focus', and `:descriptor'. +`:label', `:callback', `:initial-focus', `:descriptor', and `:visible'. #### Document me. \[GUI-KEYWORDS] stands for keywords accepted by many widgets. diff -r 489e76b8582868ac588551ea0565ef43e695da54 -r 68f8d295be49fb1f37b708c368bb1b2b06dd75c9 lisp/menubar.el --- a/lisp/menubar.el +++ b/lisp/menubar.el ＠＠ -79,9 +79,9 ＠＠ (setq menu (cdr menu))) (let (menuitem item) (while (keywordp (setq item (car menu))) - (or (memq item '(:config :included :filter :accelerator :active)) + (or (memq item '(:config :included :visible :filter :accelerator :active)) (signal 'error - (list "menu keyword must be :config, :included, :accelerator, :active or :filter" + (list "menu keyword must be :config, :included, :visible, :accelerator, :active or :filter" item))) (if (or (not (cdr menu)) (vectorp (nth 1 menu)) ＠＠ -135,7 +135,7 ＠＠ (setq item (aref menuitem i)) (cond ((not (memq item '(:active :suffix :keys :style :full :included :selected - :accelerator))) + :visible :accelerator))) (signal 'error (list (if (keywordp item) "unknown menu item keyword" diff -r 489e76b8582868ac588551ea0565ef43e695da54 -r 68f8d295be49fb1f37b708c368bb1b2b06dd75c9 man/ChangeLog --- a/man/ChangeLog +++ b/man/ChangeLog ＠＠ -1,3 +1,10 ＠＠ +2013-01-22 Jerry James <james(a)xemacs.org> + + * lispref/glyphs.texi (Image Instantiators): Add :visible to the + list of allowed menu keywords. + * lispref/menus.tex (Menu Format): Document that :visible is an + alias for :included. + 2013-01-04 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.33 "horseradish" is released. diff -r 489e76b8582868ac588551ea0565ef43e695da54 -r 68f8d295be49fb1f37b708c368bb1b2b06dd75c9 man/lispref/glyphs.texi --- a/man/lispref/glyphs.texi +++ b/man/lispref/glyphs.texi ＠＠ -299,6 +299,7 ＠＠＠itemx :filter ＠itemx :config ＠itemx :included +＠itemx:visible ＠itemx :key-sequence ＠itemx :accelerator ＠itemx :label diff -r 489e76b8582868ac588551ea0565ef43e695da54 -r 68f8d295be49fb1f37b708c368bb1b2b06dd75c9 man/lispref/menus.texi --- a/man/lispref/menus.texi +++ b/man/lispref/menus.texi ＠＠ -45,6 +45,7 ＠＠＠item :included ＠var{form} This can be used to control the visibility of a menu. The form is evaluated and the menu will be omitted if the result is ＠code{nil}. +The keyword ＠code{:visible} is an alias for ＠code{:included}. ＠item :config ＠var{symbol} This is an efficient shorthand for ＠code{:included (memq ＠var{symbol} ＠＠ -224,7 +225,8 ＠＠ non-＠code{nil}. Note that this is different from ＠code{:active}: If ＠code{:active} evaluates to ＠code{nil}, the item will be displayed grayed out, while if ＠code{:included} evaluates to ＠code{nil}, the item -will be omitted entirely. +will be omitted entirely. The keyword ＠code{:visible} is an alias for +＠code{:included}. ＠item :config ＠var{symbol} This is an efficient shorthand for ＠code{:included (memq ＠var{symbol} diff -r 489e76b8582868ac588551ea0565ef43e695da54 -r 68f8d295be49fb1f37b708c368bb1b2b06dd75c9 src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog ＠＠ -1,3 +1,13 ＠＠ +2013-01-22 Jerry James <james(a)xemacs.org> + + * general-slots.h: Add Q_visible. + * gui.c (gui_item_add_keyval_pair): Add :visible as an alias to + :included. + * menubar.c (vars_of_menubar): Document that :visible is an alias + to :included. + * menubar-gtk.c (menu_convert): Ditto. + * menubar-x.c (menu_item_descriptor_to_widget_value_1): Ditto. + 2013-01-16 Jerry James <james(a)xemacs.org> * menubar-x.c (set_frame_menubar): when a menubar specification has an diff -r 489e76b8582868ac588551ea0565ef43e695da54 -r 68f8d295be49fb1f37b708c368bb1b2b06dd75c9 src/general-slots.h --- a/src/general-slots.h +++ b/src/general-slots.h ＠＠ -312,6 +312,7 ＠＠ SYMBOL_KEYWORD (Q_value); SYMBOL (Qvalue_assoc); SYMBOL (Qvertical); +SYMBOL_KEYWORD (Q_visible); SYMBOL (Qwarning); SYMBOL (Qwidget); SYMBOL (Qwidth); diff -r 489e76b8582868ac588551ea0565ef43e695da54 -r 68f8d295be49fb1f37b708c368bb1b2b06dd75c9 src/gui.c --- a/src/gui.c +++ b/src/gui.c ＠＠ -144,7 +144,6 ＠＠ } FROB (suffix) FROB (active) - FROB (included) FROB (config) FROB (filter) FROB (style) ＠＠ -154,6 +153,14 ＠＠ FROB (callback_ex) FROB (value) #undef FROB + else if (EQ (key, Q_included) || EQ (key, Q_visible)) + { + if (!EQ (pgui_item->included, val)) + { + retval = 1; + pgui_item->included = val; + } + } else if (EQ (key, Q_key_sequence)) ; /* ignored for FSF compatibility */ else if (EQ (key, Q_label)) ; /* ignored for 21.0 implement in 21.2 */ else if (EQ (key, Q_accelerator)) diff -r 489e76b8582868ac588551ea0565ef43e695da54 -r 68f8d295be49fb1f37b708c368bb1b2b06dd75c9 src/menubar-gtk.c --- a/src/menubar-gtk.c +++ b/src/menubar-gtk.c ＠＠ -631,7 +631,7 ＠＠ cascade); val = Fcar (desc); desc = Fcdr (desc); - if (EQ (key, Q_included)) + if (EQ (key, Q_included) || EQ(key, Q_visible)) include_p = val, included_spec = 1; else if (EQ (key, Q_config)) config_tag = val; diff -r 489e76b8582868ac588551ea0565ef43e695da54 -r 68f8d295be49fb1f37b708c368bb1b2b06dd75c9 src/menubar-x.c --- a/src/menubar-x.c +++ b/src/menubar-x.c ＠＠ -172,7 +172,7 ＠＠ sferror ("Keyword in menu lacks a value", cascade); val = Fcar (desc); desc = Fcdr (desc); - if (EQ (key, Q_included)) + if (EQ (key, Q_included) || EQ (key, Q_visible)) include_p = val, included_spec = 1; else if (EQ (key, Q_config)) config_tag = val; diff -r 489e76b8582868ac588551ea0565ef43e695da54 -r 68f8d295be49fb1f37b708c368bb1b2b06dd75c9 src/menubar.c --- a/src/menubar.c +++ b/src/menubar.c ＠＠ -495,7 +495,7 ＠＠ Immediately following the name string of the menu, various optional keyword-value pairs are permitted: currently, :filter, :active, :included, -and:config. (See below.) +:visible, and :config. (See below.) If an element of a menu (or menubar) is a string, then that string will be presented as unselectable text. ＠＠ -597,7 +597,8 ＠＠ :included <form> This can be used to control the visibility of a menu or menu item. The form is evaluated and the menu or menu - item is only displayed if the result is non-nil. + item is only displayed if the result is non-nil. The + keyword :visible is an alias for :included. :config <symbol> This is an efficient shorthand for :included (memq symbol menubar-configuration) Repository URL: https://bitbucket.org/xemacs/xemacs/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

1 participants
0 comments

[PATCH 21.5] Support the :visible keyword in menu specs 11 years, 3 months

Jerry James

PATCH 21.5 Now that we don't crash when handed the ESS menu specification that uses:visible, let's support that keyword. The Emacs documentation says that :visible and :included are keywords. We already support :included, so the attached patch just makes :visible an alias to :included. I will attempt to also include the patch inline here for easier perusal, but there's no telling what gmail is going to do to it, hence the attachment. diff -r 489e76b85828 lisp/ChangeLog --- a/lisp/ChangeLog Mon Jan 21 10:17:55 2013 -0700 +++ b/lisp/ChangeLog Tue Jan 22 11:48:45 2013 -0700 ＠＠ -1,3 +1,9 ＠＠ +2013-01-22 Jerry James <james(a)xemacs.org> + + * glyphs.el (make-image-specifier): Document that :visible is a + widget keyword. + * menubar.el (check-menu-syntax): Allow :visible in menu specs. + 2013-01-04 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.33 "horseradish" is released. diff -r 489e76b85828 lisp/glyphs.el --- a/lisp/glyphs.el Mon Jan 21 10:17:55 2013 -0700 +++ b/lisp/glyphs.el Tue Jan 22 11:48:45 2013 -0700 ＠＠ -266,7 +266,7 ＠＠ \[WIDGET-KEYWORDS] stands for the standard keywords accepted by widgets: These are `:selected', `:active', `:suffix', `:keys', `:style', `:filter', `:config', `:included', `:key-sequence', `:accelerator', -`:label', `:callback', `:initial-focus', and `:descriptor'. +`:label', `:callback', `:initial-focus', `:descriptor', and `:visible'. #### Document me. \[GUI-KEYWORDS] stands for keywords accepted by many widgets. diff -r 489e76b85828 lisp/menubar.el --- a/lisp/menubar.el Mon Jan 21 10:17:55 2013 -0700 +++ b/lisp/menubar.el Tue Jan 22 11:48:45 2013 -0700 ＠＠ -79,9 +79,9 ＠＠ (setq menu (cdr menu))) (let (menuitem item) (while (keywordp (setq item (car menu))) - (or (memq item '(:config :included :filter :accelerator :active)) + (or (memq item '(:config :included :visible :filter :accelerator :active)) (signal 'error - (list "menu keyword must be :config, :included, :accelerator, :active or :filter" + (list "menu keyword must be :config, :included, :visible, :accelerator, :active or :filter" item))) (if (or (not (cdr menu)) (vectorp (nth 1 menu)) ＠＠ -135,7 +135,7 ＠＠ (setq item (aref menuitem i)) (cond ((not (memq item '(:active :suffix :keys :style :full :included :selected -:accelerator))) +:visible :accelerator))) (signal 'error (list (if (keywordp item) "unknown menu item keyword" diff -r 489e76b85828 man/ChangeLog --- a/man/ChangeLog Mon Jan 21 10:17:55 2013 -0700 +++ b/man/ChangeLog Tue Jan 22 11:48:45 2013 -0700 ＠＠ -1,3 +1,10 ＠＠ +2013-01-22 Jerry James <james(a)xemacs.org> + + * lispref/glyphs.texi (Image Instantiators): Add :visible to the + list of allowed menu keywords. + * lispref/menus.tex (Menu Format): Document that :visible is an + alias for :included. + 2013-01-04 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.33 "horseradish" is released. diff -r 489e76b85828 man/lispref/glyphs.texi --- a/man/lispref/glyphs.texi Mon Jan 21 10:17:55 2013 -0700 +++ b/man/lispref/glyphs.texi Tue Jan 22 11:48:45 2013 -0700 ＠＠ -299,6 +299,7 ＠＠＠itemx :filter ＠itemx :config ＠itemx :included +＠itemx:visible ＠itemx :key-sequence ＠itemx :accelerator ＠itemx :label diff -r 489e76b85828 man/lispref/menus.texi --- a/man/lispref/menus.texi Mon Jan 21 10:17:55 2013 -0700 +++ b/man/lispref/menus.texi Tue Jan 22 11:48:45 2013 -0700 ＠＠ -45,6 +45,7 ＠＠＠item :included ＠var{form} This can be used to control the visibility of a menu. The form is evaluated and the menu will be omitted if the result is ＠code{nil}. +The keyword ＠code{:visible} is an alias for ＠code{:included}. ＠item :config ＠var{symbol} This is an efficient shorthand for ＠code{:included (memq ＠var{symbol} ＠＠ -224,7 +225,8 ＠＠ non-＠code{nil}. Note that this is different from ＠code{:active}: If ＠code{:active} evaluates to ＠code{nil}, the item will be displayed grayed out, while if ＠code{:included} evaluates to ＠code{nil}, the item -will be omitted entirely. +will be omitted entirely. The keyword ＠code{:visible} is an alias for +＠code{:included}. ＠item :config ＠var{symbol} This is an efficient shorthand for ＠code{:included (memq ＠var{symbol} diff -r 489e76b85828 src/ChangeLog --- a/src/ChangeLog Mon Jan 21 10:17:55 2013 -0700 +++ b/src/ChangeLog Tue Jan 22 11:48:45 2013 -0700 ＠＠ -1,3 +1,13 ＠＠ +2013-01-22 Jerry James <james(a)xemacs.org> + + * general-slots.h: Add Q_visible. + * gui.c (gui_item_add_keyval_pair): Add :visible as an alias to +:included. + * menubar.c (vars_of_menubar): Document that :visible is an alias + to :included. + * menubar-gtk.c (menu_convert): Ditto. + * menubar-x.c (menu_item_descriptor_to_widget_value_1): Ditto. + 2013-01-16 Jerry James <james(a)xemacs.org> * menubar-x.c (set_frame_menubar): when a menubar specification has an diff -r 489e76b85828 src/general-slots.h --- a/src/general-slots.h Mon Jan 21 10:17:55 2013 -0700 +++ b/src/general-slots.h Tue Jan 22 11:48:45 2013 -0700 ＠＠ -312,6 +312,7 ＠＠ SYMBOL_KEYWORD (Q_value); SYMBOL (Qvalue_assoc); SYMBOL (Qvertical); +SYMBOL_KEYWORD (Q_visible); SYMBOL (Qwarning); SYMBOL (Qwidget); SYMBOL (Qwidth); diff -r 489e76b85828 src/gui.c --- a/src/gui.c Mon Jan 21 10:17:55 2013 -0700 +++ b/src/gui.c Tue Jan 22 11:48:45 2013 -0700 ＠＠ -144,7 +144,6 ＠＠ } FROB (suffix) FROB (active) - FROB (included) FROB (config) FROB (filter) FROB (style) ＠＠ -154,6 +153,14 ＠＠ FROB (callback_ex) FROB (value) #undef FROB + else if (EQ (key, Q_included) || EQ (key, Q_visible)) + { + if (!EQ (pgui_item->included, val)) + { + retval = 1; + pgui_item->included = val; + } + } else if (EQ (key, Q_key_sequence)) ; /* ignored for FSF compatibility */ else if (EQ (key, Q_label)) ; /* ignored for 21.0 implement in 21.2 */ else if (EQ (key, Q_accelerator)) diff -r 489e76b85828 src/menubar-gtk.c --- a/src/menubar-gtk.c Mon Jan 21 10:17:55 2013 -0700 +++ b/src/menubar-gtk.c Tue Jan 22 11:48:45 2013 -0700 ＠＠ -631,7 +631,7 ＠＠ cascade); val = Fcar (desc); desc = Fcdr (desc); - if (EQ (key, Q_included)) + if (EQ (key, Q_included) || EQ(key, Q_visible)) include_p = val, included_spec = 1; else if (EQ (key, Q_config)) config_tag = val; diff -r 489e76b85828 src/menubar-x.c --- a/src/menubar-x.c Mon Jan 21 10:17:55 2013 -0700 +++ b/src/menubar-x.c Tue Jan 22 11:48:45 2013 -0700 ＠＠ -172,7 +172,7 ＠＠ sferror ("Keyword in menu lacks a value", cascade); val = Fcar (desc); desc = Fcdr (desc); - if (EQ (key, Q_included)) + if (EQ (key, Q_included) || EQ (key, Q_visible)) include_p = val, included_spec = 1; else if (EQ (key, Q_config)) config_tag = val; diff -r 489e76b85828 src/menubar.c --- a/src/menubar.c Mon Jan 21 10:17:55 2013 -0700 +++ b/src/menubar.c Tue Jan 22 11:48:45 2013 -0700 ＠＠ -495,7 +495,7 ＠＠ Immediately following the name string of the menu, various optional keyword-value pairs are permitted: currently, :filter, :active, :included, -and:config. (See below.) +:visible, and :config. (See below.) If an element of a menu (or menubar) is a string, then that string will be presented as unselectable text. ＠＠ -597,7 +597,8 ＠＠ :included <form> This can be used to control the visibility of a menu or menu item. The form is evaluated and the menu or menu - item is only displayed if the result is non-nil. + item is only displayed if the result is non-nil. The + keyword :visible is an alias for :included. :config <symbol> This is an efficient shorthand for :included (memq symbol menubar-configuration) _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches

2 participants
4 comments

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

XEmacs-Patches January 2013