Show
Ignore:
Timestamp:
09/30/06 09:12:06 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/lisp

    • Property svn:ignore changed from
      *.elc
      MANIFEST
      Makefile
      Makefile.unix
      makefile
      elc.tar.gz
      cus-load.el
      finder-inf.el
      subdirs.el
      loaddefs.el
      to
      *.elc
      MANIFEST
      Makefile
      Makefile.unix
      makefile
      elc.tar.gz
      cus-load.el
      finder-inf.el
      subdirs.el
      loaddefs.el
      pre-mh-loaddefs.el-CMD
  • trunk/lisp/mouse.el

    r4166 r4169  
    557557         (start-event-frame (window-frame (car (car (cdr start-event))))) 
    558558         (start-event-window (car (car (cdr start-event)))) 
    559          event mouse x left right edges wconfig growth 
     559         event mouse x left right edges growth 
    560560         (which-side 
    561561          (or (cdr (assq 'vertical-scroll-bars (frame-parameters start-event-frame))) 
     
    777777 
    778778(defun mouse-posn-property (pos property) 
    779   "Look for a property at click position." 
     779  "Look for a property at click position. 
     780POS may be either a buffer position or a click position like 
     781those returned from `event-start'.  If the click position is on 
     782a string, the text property PROPERTY is examined. 
     783If this is nil or the click is not on a string, then 
     784the corresponding buffer position is searched for PROPERTY. 
     785If PROPERTY is encountered in one of those places, 
     786its value is returned." 
    780787  (if (consp pos) 
    781788      (let ((w (posn-window pos)) (pt (posn-point pos)) 
     
    836843      (and (mouse-posn-property pos 'mouse-face) t)) 
    837844     ((functionp action) 
    838       (funcall action pos)) 
     845      ;; FIXME: This seems questionable if the click is not in a buffer. 
     846      ;; Should we instead decide that `action' takes a `posn'? 
     847      (if (consp pos) 
     848          (with-current-buffer (window-buffer (posn-window pos)) 
     849            (funcall action (posn-point pos)))   
     850        (funcall action pos))) 
    839851     (t action)))) 
    840852