Mercurial > hg > xemacs-beta

comparison lisp/behavior.el @ 5524:e05d98bf9644

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Style and indentation corrections, behavior.el. 2011-06-19 Aidan Kehoe <kehoea@parhasard.net> * behavior.el (enable-behavior): * behavior.el (disable-behavior): Remove a couple of redundant lambdas here, and remove a cond clause that was never tripped (because nil is a list.) * behavior.el (behavior-menu-filter): Correct some indentation here.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 19 Jun 2011 19:15:52 +0100
parents 308d34e9f07d
children 5d3bb1100832
comparison
equal deleted inserted replaced
5523:810b77562486 5524:e05d98bf9644
370 (or force (not (memq behavior enabled-behavior-list)) 370 (or force (not (memq behavior enabled-behavior-list))
371 (error 'invalid-change "Behavior already enabled" behavior)) 371 (error 'invalid-change "Behavior already enabled" behavior))
372 (let ((require (getf plist :require)) 372 (let ((require (getf plist :require))
373 (enable (getf plist :enable))) 373 (enable (getf plist :enable)))
374 (cond ((listp require) 374 (cond ((listp require)
375 (mapc #'(lambda (sym) (require sym)) require)) 375 (mapc 'require require))
376 ((symbolp require) 376 ((symbolp require)
377 (require require)) 377 (require require))
378 ((null require))
379 (t (error 'invalid-argument "Invalid :require spec" require))) 378 (t (error 'invalid-argument "Invalid :require spec" require)))
380 (message "Enabling behavior %s..." behavior) 379 (message "Enabling behavior %s..." behavior)
381 (if enable (funcall enable)) 380 (if enable (funcall enable))
382 (message "Enabling behavior %s...done" behavior) 381 (message "Enabling behavior %s...done" behavior)
383 (let ((within-behavior-enabling-disabling t)) 382 (let ((within-behavior-enabling-disabling t))
393 (or force (memq behavior enabled-behavior-list) 392 (or force (memq behavior enabled-behavior-list)
394 (error 'invalid-change "Behavior not enabled" behavior)) 393 (error 'invalid-change "Behavior not enabled" behavior))
395 (let ((require (getf plist :require)) 394 (let ((require (getf plist :require))
396 (disable (getf plist :disable))) 395 (disable (getf plist :disable)))
397 (cond ((listp require) 396 (cond ((listp require)
398 (mapc #'(lambda (sym) (require sym)) require)) 397 (mapc 'require require))
399 ((symbolp require) 398 ((symbolp require)
400 (require require)) 399 (require require))
401 ((null require))
402 (t (error 'invalid-argument "Invalid :require spec" require))) 400 (t (error 'invalid-argument "Invalid :require spec" require)))
403 (message "Disabling behavior %s..." behavior) 401 (message "Disabling behavior %s..." behavior)
404 (if disable (funcall disable)) 402 (if disable (funcall disable))
405 (message "Disabling behavior %s...done" behavior) 403 (message "Disabling behavior %s...done" behavior)
406 (let ((within-behavior-enabling-disabling t)) 404 (let ((within-behavior-enabling-disabling t))
474 (append 472 (append
475 `(("%_Package Utilities" 473 `(("%_Package Utilities"
476 ("%_Set Download Site" 474 ("%_Set Download Site"
477 ("%_Official Releases" 475 ("%_Official Releases"
478 :filter ,#'(lambda (&rest junk) 476 :filter ,#'(lambda (&rest junk)
479 (menu-split-long-menu 477 (menu-split-long-menu
480 (submenu-generate-accelerator-spec 478 (submenu-generate-accelerator-spec
481 (package-ui-download-menu))))) 479 (package-ui-download-menu)))))
482 ("%_Pre-Releases" 480 ("%_Pre-Releases"
483 :filter ,#'(lambda (&rest junk) 481 :filter ,#'(lambda (&rest junk)
484 (menu-split-long-menu 482 (menu-split-long-menu
485 (submenu-generate-accelerator-spec 483 (submenu-generate-accelerator-spec
486 (package-ui-pre-release-download-menu))))) 484 (package-ui-pre-release-download-menu)))))