# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: kanru@kanru.info-20130717080021-cmprj244462z7bf1 # target_branch: bzr://bzr.savannah.gnu.org/emacs/trunk/ # testament_sha1: a6ecbede343a3850a462576604f134690e9df849 # timestamp: 2013-07-17 16:14:54 +0800 # base_revision_id: eggert@cs.ucla.edu-20130715025617-8jaslimwdmfjvd1t # # Begin patch === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-07-15 02:33:54 +0000 +++ lisp/ChangeLog 2013-07-17 08:00:21 +0000 @@ -1,3 +1,8 @@ +2013-07-17 Kan-Ru Chen (陳侃如) + + * ibuf-ext.el (filename): Use ibuffer-buffer-file-name so the + filename filter works consistently with the displayed filename. + 2013-07-15 Paul Eggert * shell.el (explicit-bash-args): Remove obsolete hack for Bash 1.x. === modified file 'lisp/ibuf-ext.el' --- lisp/ibuf-ext.el 2013-06-12 11:42:12 +0000 +++ lisp/ibuf-ext.el 2013-07-17 08:00:21 +0000 @@ -1050,7 +1050,7 @@ "Toggle current view to buffers with filename matching QUALIFIER." (:description "filename" :reader (read-from-minibuffer "Filter by filename (regexp): ")) - (ibuffer-awhen (buffer-local-value 'buffer-file-name buf) + (ibuffer-awhen (with-current-buffer buf (ibuffer-buffer-file-name)) (string-match qualifier it))) ;;;###autoload (autoload 'ibuffer-filter-by-size-gt "ibuf-ext") # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWtBu9AAAjjf+QAwUHP/91oM EgC////wGAAAIAEACAEGIFAEmeadCq7jt3UulVhJKaJNiamyU/Jqb1Ghok9PIgR5TaQAfqgkomVP MTUxNMRNAnlPUPKMBBgQaYSmoqfiTTU09TymNJoMho0GagwgABzAATJgATCYJhDAEYAEkgImBMmm min6Co9R5T9UMNAGkAJs1k9W4+4i2mkUanPrTVPmfcZie+URdfgXXukpoaCnPG0rM+8hJk/uDU+K Md57xygq4Ouzax3IatZgDSMef16vIYk2Q8YNTzJkS7nqaecDHMyz8UPZBklrD0wX47NDpYWnyPlE N4DBjNamXRliBw7J6jG9RXie+EjfR0CNHWcRaGkx1NlmyFmJLgw2KDUBOJnuEt20CE0dYyGFm5PH Djds5d2BaAU1CtpUWgFKZxUbycdlpcD7HJ6mgY7eEyKq9fEw/O6sUxTfxNjdZor/LnCUBWZlnC12 BwqNVjcgpV+JVcngXmyXRhZ2FoS6cK8c1pZpwphCraLuyFnEWRUgltyMuKjSdz5gPUDGnNkdcKzW sDEpsKBKmY4UJ1XuHkAtIRde5+zHTWgJDZ52CfWMRE4B4HAYDCKjOOcC1Pk+shYUmGZshMGf6kco qqxYMSz0EHGLS5SLRlp9Wj5tnDYLo89wnSnUUFYxqywQZ4zuNIUm+8HFDpzqZIYFuUB5YWFhWVSC BviWgVjyY8VZSzA05rALIuor1P0toiQhkZpUWzKiJyk44rCgVOV4ptC8rsbuOlIJb3ItoaLoZQUX AoqLSYlJb8MjWHThnSVaWYTY8Vo6QRyjCnSQzNz7JSFtUDxxAZIyBF3BwaAzDhVlffSaqrGumm2I v8KEijoRTq4ETSpXqRZ7c53+GOtdzAUvfSiVgZfUWsW83j5XGu3TJvtodEEwHKec49AiyruWa2lU T0F5O8OGJEMh28iRRupsYOaY86wPJVPDewW0MhlMAmHMhGHT1WGikqxURsgdZQQmSinT0CYvc/Q8 HSOwMLyL+fMrFja3l1DrUimrqzve4wMFiK8JjcoAyuGS3Vu1RhbseRo3qQxoh+IbOSTDPKttnqYU dikJgKCxMB8Sxcz8j3O+I8L10SHHX07O8VfiZDDwtDi9cJG1i6wEIS8oTjmRESbaPLyZqnDQ0V/d DR8FVYgHFyk8UZXiJrKoa0XojUw4rVkBDEDxXhtXI1EaGiYuvNNEVHFH4MFyLnBWHkPST1WS147Y FJGXIbNlCgkRpNS00verQOJZVjWPJIcdEwdCEURZIco3chPBESaCTAy5cshgKRMX/XcXFCO7iJki 0oXB6trW7DcwwOUIEr3AP7YaxT0YMBcK0b7arqUpa7lHluAkXMV7nOeiN4Ik5eBtB+6XoWHFis4I qHFC1barySNgxQJ1R9ENvCgoCfWNY05CUgbFNCGeMiRBDAa9wT9DgXAwREVMIf5BxEuMKt2/sLVW rejlzVNRd2igIZxVe8Yif4DGSVX8wPk7Qsf6/mGH9wwwr/4u5IpwoSDWg3eg